summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValérie-Emma Leroux <emma@iggdrasil.net>2016-02-24 19:03:18 +0100
committerValérie-Emma Leroux <emma@iggdrasil.net>2016-02-24 19:03:18 +0100
commit08fd9ff26d3d61155f421d6229c3eaa2f29fa9b3 (patch)
tree80049a20180878b3420252db8d80370d48684cf3
parentf1735f9f3ee84a45f8a65cacfe43709eda392425 (diff)
downloadIshtar-08fd9ff26d3d61155f421d6229c3eaa2f29fa9b3.tar.bz2
Ishtar-08fd9ff26d3d61155f421d6229c3eaa2f29fa9b3.zip
Update translations
-rw-r--r--archaeological_operations/import_from_csv.py6
-rw-r--r--archaeological_operations/import_from_dbf.py6
-rw-r--r--example_project/local_settings.py.sample2
-rw-r--r--ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html2
-rw-r--r--ishtar_common/templates/sheet_ope.html6
5 files changed, 11 insertions, 11 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py
index 714825ff4..45faae632 100644
--- a/archaeological_operations/import_from_csv.py
+++ b/archaeological_operations/import_from_csv.py
@@ -403,18 +403,18 @@ def import_operations_csv(values, col_defs=OPE_COLS, update=True, person=None,
errors = []
if error_ope:
- error = "Error while recording theses operations:\n"
+ error = "Error while recording these operations:\n"
for line_idx, args in error_ope:
error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
errors.append(error)
if error_multis:
- error = "Error while recording theses multiples items attached to "\
+ error = "Error while recording these multiples items attached to "\
"operation:"
for line_idx, args in error_multis:
error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
errors.append(error)
if error_reversed:
- error = "Error while recording theses items that depend to operation:"
+ error = "Error while recording these items that depend to operation:"
for line_idx, args in error_reversed:
error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
errors.append(error)
diff --git a/archaeological_operations/import_from_dbf.py b/archaeological_operations/import_from_dbf.py
index 1e3d6a0ea..3ce41fdfc 100644
--- a/archaeological_operations/import_from_dbf.py
+++ b/archaeological_operations/import_from_dbf.py
@@ -308,18 +308,18 @@ def import_operations_dbf(values, col_defs=DBF_OPE_COLS, update=False,
if nb_error:
errors.append(ERROR_LBLS[error_key] + str(nb_error))
if error_ope:
- error = "Error while recording theses operations:\n"
+ error = "Error while recording these operations:\n"
for line_idx, args in error_ope:
error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
errors.append(error)
if error_multis:
- error = "Error while recording theses multiples items attached to "\
+ error = "Error while recording these multiples items attached to "\
"operation:"
for line_idx, args in error_multis:
error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
errors.append(error)
if error_reversed:
- error = "Error while recording theses items that depend to operation:"
+ error = "Error while recording these items that depend to operation:"
for line_idx, args in error_reversed:
error += "line: " + str(line_idx) + " args: " + str(args) + '\n'
errors.append(error)
diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample
index 942a35df5..ee5338801 100644
--- a/example_project/local_settings.py.sample
+++ b/example_project/local_settings.py.sample
@@ -41,7 +41,7 @@ PROJECT_SLUG = "my-project"
ALLOWED_HOSTS = []
# if your installation uses a prefix after the domain name modify and uncomment
-# theses lines
+# these lines
# DOMAIN_PREFIX = "/ishtar-test"
# LOGIN_URL = DOMAIN_PREFIX + '/accounts/login/'
# LOGIN_REDIRECT_URL = DOMAIN_PREFIX + '/accounts/profile/'
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
index 87ce5c528..d7ea16d90 100644
--- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
+++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
@@ -105,7 +105,7 @@ if (typeof values_1_{{unique_id}} === 'undefined'
|| values_1_{{unique_id}}.length == 0){
$('#chart_img_{{unique_id}}').hide();
-$('#chart_{{unique_id}}').html("<p class='alert'>{% trans 'No data for theses criteria.' %}</p>");
+$('#chart_{{unique_id}}').html("<p class='alert'>{% trans 'No data for these criteria.' %}</p>");
} else {
var showmarker = false;
diff --git a/ishtar_common/templates/sheet_ope.html b/ishtar_common/templates/sheet_ope.html
index dbe3297b3..28390af45 100644
--- a/ishtar_common/templates/sheet_ope.html
+++ b/ishtar_common/templates/sheet_ope.html
@@ -118,9 +118,9 @@
{% endfor %}
</table>
-<h3>{% trans "Recording Units"%}</h3>
+<h3>{% trans "Context Records"%}</h3>
<table>
- <caption>{%trans "Recording Units"%}</caption>
+ <caption>{%trans "Context Records"%}</caption>
<tr>
<th>{% trans "ID" %}</th>
<th>{% trans "Type" %}</th>
@@ -139,7 +139,7 @@
<td class='link'><a href="#{#{%url show-record_unit record_unit.pk%}#}">{% trans "Details" %}</a></td>
</tr>
{% empty %}
- <tr><td colspan="6" class='no_items'>{% trans "No recording unit associated to this operation" %}</td></tr>
+ <tr><td colspan="6" class='no_items'>{% trans "No context record associated to this operation" %}</td></tr>
{% endfor %}
</table>