diff --git a/promgen/locale/ja/LC_MESSAGES/django.mo b/promgen/locale/ja/LC_MESSAGES/django.mo
index 4741dc65b..787c2c2de 100644
Binary files a/promgen/locale/ja/LC_MESSAGES/django.mo and b/promgen/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/promgen/locale/ja/LC_MESSAGES/django.po b/promgen/locale/ja/LC_MESSAGES/django.po
index 4c255dcb1..5802d5757 100644
--- a/promgen/locale/ja/LC_MESSAGES/django.po
+++ b/promgen/locale/ja/LC_MESSAGES/django.po
@@ -79,8 +79,8 @@ msgid "Delete this host?"
 msgstr "Hostを削除しますか？"
 
 #: templates/promgen/project_detail_hosts.html:36
-msgid "Add new host"
-msgstr "Hostを追加"
+msgid "Register Hosts"
+msgstr "Hostsを登録"
 
 #: templates/promgen/project_detail_hosts.html:37
 msgid "Edit Farm"
@@ -105,8 +105,8 @@ msgid "Sync Farm"
 msgstr "Farmを同期"
 
 #: templates/promgen/project_detail_hosts.html:58
-msgid "New Farm"
-msgstr "New Farm"
+msgid "Register Farm"
+msgstr "Farmを登録"
 
 #: templates/promgen/project_detail_hosts.html:60
 msgid "Link Farm"
diff --git a/promgen/templates/promgen/farm_detail.html b/promgen/templates/promgen/farm_detail.html
index 7673289a1..9a4bc21e0 100644
--- a/promgen/templates/promgen/farm_detail.html
+++ b/promgen/templates/promgen/farm_detail.html
@@ -41,7 +41,7 @@ <h1>Farm: {{ farm.name }} ({{ farm.source }})</h1>
 
     <div class="panel-footer">
   {% if farm.editable %}
-      <a href="{% url 'hosts-add' farm.id %}" class="btn btn-primary">Add new host</a>
+      <a href="{% url 'hosts-add' farm.id %}" class="btn btn-primary">{% trans "Register Hosts" %}</a>
   {% endif %}
     <form method="post" action="{% url 'farm-delete' farm.id %}" onsubmit="return confirm('Delete this farm?')" style="display: inline">
       {% csrf_token %}
diff --git a/promgen/templates/promgen/host_form.html b/promgen/templates/promgen/host_form.html
index 0193c3e3a..5d54387be 100644
--- a/promgen/templates/promgen/host_form.html
+++ b/promgen/templates/promgen/host_form.html
@@ -17,7 +17,7 @@ <h1>Farm: {{ farm.name }}</h1>
   <table>
     {{ form.as_table }}
   </table>
-    <input type="submit" value="Register Hosts" />
+  <input type="submit" value="{% trans 'Register Hosts' %}" />
 </form>
 
 {% endblock %}
diff --git a/promgen/templates/promgen/project_detail_hosts.html b/promgen/templates/promgen/project_detail_hosts.html
index e1d3227c3..b7aa9fe3b 100644
--- a/promgen/templates/promgen/project_detail_hosts.html
+++ b/promgen/templates/promgen/project_detail_hosts.html
@@ -48,7 +48,7 @@
 {% if project.farm %}
   {% if project.farm.editable %}
     <a href="{% url 'hosts-add' project.farm.id %}" class="btn btn-primary">
-      {% trans "Add new host" %}
+      {% trans "Register Hosts" %}
     </a>
     <a href="{% url 'farm-update' project.farm.id %}" class="btn btn-default">
       {% trans "Edit Farm" %}
@@ -81,7 +81,7 @@
     </button>
   </form>
 {% else %}
-    <a href="{% url 'farm-new' project.id %}" class="btn btn-primary">{% trans "New Farm" %}</a>
+    <a href="{% url 'farm-new' project.id %}" class="btn btn-primary">{% trans "Register Farm" %}</a>
 {% for name, source in sources %}
     <a href="{% url 'farm-link' project.id name %}" class="btn btn-default">
       {% if source.remote %}
diff --git a/promgen/views.py b/promgen/views.py
index f7d6f510e..1cc6d5900 100644
--- a/promgen/views.py
+++ b/promgen/views.py
@@ -692,7 +692,7 @@ class URLList(LoginRequiredMixin, ListView):
 
 
 class ProjectRegister(LoginRequiredMixin, CreateView):
-    button_label = _("Project Register")
+    button_label = _("Register Project")
     model = models.Project
     fields = ["name", "description", "owner", "shard"]