7c04c3ecc0
Resolves: #2075727 - The memory usage of the squid process keeps increasing
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From fc01451000eaa5592cd5afbd6aee14e53f7dd2c3 Mon Sep 17 00:00:00 2001
|
|
From: Amos Jeffries <amosjeffries@squid-cache.org>
|
|
Date: Sun, 18 Oct 2020 20:23:10 +1300
|
|
Subject: [PATCH] Update translations integration
|
|
|
|
* Add credits for es-mx translation moderator
|
|
* Use es-mx for default of all Spanish (Central America) texts
|
|
* Update translation related .am files
|
|
---
|
|
doc/manuals/language.am | 2 +-
|
|
errors/TRANSLATORS | 1 +
|
|
errors/aliases | 3 ++-
|
|
errors/language.am | 3 ++-
|
|
errors/template.am | 2 +-
|
|
5 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/doc/manuals/language.am b/doc/manuals/language.am
|
|
index 7670c88380c..f03c4cf71b4 100644
|
|
--- a/doc/manuals/language.am
|
|
+++ b/doc/manuals/language.am
|
|
@@ -18,4 +18,4 @@ TRANSLATE_LANGUAGES = \
|
|
oc.lang \
|
|
pt.lang \
|
|
ro.lang \
|
|
- ru.lang
|
|
+ ru.lang
|
|
diff --git a/errors/aliases b/errors/aliases
|
|
index 36f17f4b80f..cf0116f297d 100644
|
|
--- a/errors/aliases
|
|
+++ b/errors/aliases
|
|
@@ -14,7 +14,8 @@ da da-dk
|
|
de de-at de-ch de-de de-li de-lu
|
|
el el-gr
|
|
en en-au en-bz en-ca en-cn en-gb en-ie en-in en-jm en-nz en-ph en-sg en-tt en-uk en-us en-za en-zw
|
|
-es es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-gt es-hn es-mx es-ni es-pa es-pe es-pr es-py es-sv es-us es-uy es-ve es-xl
|
|
+es es-ar es-bo es-cl es-cu es-co es-do es-ec es-es es-pe es-pr es-py es-us es-uy es-ve es-xl spq
|
|
+es-mx es-bz es-cr es-gt es-hn es-ni es-pa es-sv
|
|
et et-ee
|
|
fa fa-fa fa-ir
|
|
fi fi-fi
|
|
diff --git a/errors/language.am b/errors/language.am
|
|
index 12b1b2b3b43..029e8c1eb2f 100644
|
|
--- a/errors/language.am
|
|
+++ b/errors/language.am
|
|
@@ -17,6 +17,7 @@ TRANSLATE_LANGUAGES = \
|
|
de.lang \
|
|
el.lang \
|
|
en.lang \
|
|
+ es-mx.lang \
|
|
es.lang \
|
|
et.lang \
|
|
fa.lang \
|
|
@@ -51,4 +52,4 @@ TRANSLATE_LANGUAGES = \
|
|
uz.lang \
|
|
vi.lang \
|
|
zh-hans.lang \
|
|
- zh-hant.lang
|
|
+ zh-hant.lang
|
|
diff --git a/errors/template.am b/errors/template.am
|
|
index 6c12781e6f4..715c65aa22b 100644
|
|
--- a/errors/template.am
|
|
+++ b/errors/template.am
|
|
@@ -48,4 +48,4 @@ ERROR_TEMPLATES = \
|
|
templates/ERR_UNSUP_REQ \
|
|
templates/ERR_URN_RESOLVE \
|
|
templates/ERR_WRITE_ERROR \
|
|
- templates/ERR_ZERO_SIZE_OBJECT
|
|
+ templates/ERR_ZERO_SIZE_OBJECT
|