diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /ishtar_common/templates/base.html | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'ishtar_common/templates/base.html')
| -rw-r--r-- | ishtar_common/templates/base.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 7101ed7de..dcd3043ca 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -38,8 +38,8 @@ var get_find_url = '{% url "get-find-shortcut" %}'; var activate_all_search_url = '{% url "activate-all-search" %}'; var activate_own_search_url = '{% url "activate-own-search" %}'; - var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deals with all items.' %}"; - var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deals with only your items.' %}"; + var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deal with all items.' %}"; + var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}"; </script> </head> <body{% if current_theme%} id='{{current_theme}}'{%endif%}> |