Git commit 74dbbd5feadd5a87d17d7b06178e4c77481499eb by Oliver Kellogg.
Committed on 25/03/2024 at 17:51.
Pushed by okellogg into branch 'master'.
Fix typo "ortography" -> "orthography"
* In lang/{nb,nn,sr}/rules rename ortography.rules to orthography.rules
* Globally change "ortography" to "orthography".
M +1 -1 doc/user/diffpatch.docbook
M +2 -2 doc/user/lingo.docbook
M +2 -2 doc/user/poformat.docbook
M +1 -1 doc/user/summit.docbook
M +1 -1 lang/nb/rules/CMakeLists.txt
R +1 -1 lang/nb/rules/orthography.rules [from:
lang/nb/rules/ortography.rules - 088% similarity]
M +1 -1 lang/nn/exclusion/README
M +1 -1 lang/nn/rules/CMakeLists.txt
R +1 -1 lang/nn/rules/orthography.rules [from:
lang/nn/rules/ortography.rules - 099% similarity]
M +1 -1 lang/sr/rules/CMakeLists.txt
R +1 -1 lang/sr/rules/orthography.rules [from:
lang/sr/rules/ortography.rules - 089% similarity]
M +2 -2 pology/lang/nb/exclusion.py
M +2 -2 pology/lang/nn/exclusion.py
M +1 -1 pology/lang/sr/nobr.py
M +1 -1 pology/proj/kde/header.py
https://invent.kde.org/sdk/pology/-/commit/74dbbd5feadd5a87d17d7b06178e4c77481499eb
diff --git a/doc/user/diffpatch.docbook b/doc/user/diffpatch.docbook
index 8fee02158..f5fd5edaf 100644
--- a/doc/user/diffpatch.docbook
+++ b/doc/user/diffpatch.docbook
@@ -990,7 +990,7 @@ Since the file of rejects is also an ediff PO, after edits
such as this to make
<sect2 id="sec-dppatchemb">
<title>Embedding Patches</title>
-<para>Depending on the kind of text which is being translated, and distance
between the source and target language grammar, ortography, and style, it may
be difficult to review the ediff in isolation. In general, messages in ediff PO
file will lack <emphasis>positional context</emphasis>, which is in the full PO
provided by messages immediately preceding and following the observed message.
For example, a long passage from documentation probably needs no positional
context. But a short, newly added message such as "Crimson" could very well
need one, if it has neither <varname>msgctxt</varname> nor an extracted comment
describing it: is it really a color? what grammatical ending should it have (in
a language which matches adjective to noun gender)? Several messages around it
in the full PO file could easily show whether it is just another color in a
row, and their grammatical endings (determined by a translator earlier).</para>
+<para>Depending on the kind of text which is being translated, and distance
between the source and target language grammar, orthography, and style, it may
be difficult to review the ediff in isolation. In general, messages in ediff PO
file will lack <emphasis>positional context</emphasis>, which is in the full PO
provided by messages immediately preceding and following the observed message.
For example, a long passage from documentation probably needs no positional
context. But a short, newly added message such as "Crimson" could very well
need one, if it has neither <varname>msgctxt</varname> nor an extracted comment
describing it: is it really a color? what grammatical ending should it have (in
a language which matches adjective to noun gender)? Several messages around it
in the full PO file could easily show whether it is just another color in a
row, and their grammatical endings (determined by a translator earlier).</para>
<para>Another difficulty is when an ediff message needs some editing before
being applied. This may not be easy to do this directly in the ediff PO file.
Everything is fine so long as only the added text segments
(<literal>{+...+}</literal>) are edited, but if the sentence needs to be
restructured more thoroughly, the reviewer would have to make sure to put all
additions into existing or new <literal>{+...+}</literal> segments, and to wrap
all removals as <literal>{-...-}</literal> segments. If this is not carefully
performed, the patch will not be applicable any more, as the old message
resolved from it will no longer exactly match a message in the target PO
file.</para>
diff --git a/doc/user/lingo.docbook b/doc/user/lingo.docbook
index 4160c7138..57519585e 100644
--- a/doc/user/lingo.docbook
+++ b/doc/user/lingo.docbook
@@ -17,7 +17,7 @@
<para>The first level is simply the "language". In linguistic sense this can
be a language proper (whatever that means), a dialect, a variant written in
different script, etc. Each language in this sense is assigned a code in
Pology, when first elements of support for that language are introduced. By
convention this code should be an <ulink
url="http://en.wikipedia.org/wiki/ISO_639";>ISO 639</ulink> code (either two- or
three-digit) if applicable, but in principle can be anything. Another
convenient source of language codes is the GNU C library. For example,
Portugese language spoken in Portugal would have the code <literal>pt</literal>
(ISO 639) while Portugese spoken in Brazil would be <literal>pt_BR</literal>
(GNU C library).</para>
-<para>The second level of language-specificity is the "environment". In
linguistic terms this could be whatever distinct but minor variations in
vocabulary, style, tone, or ortography, which are specific to certain groups of
people within a single language community. Within Pology, this level is used to
support variations between specific translation environments, such as
long-standing translation projects and their teams. Although translating into
the same language, translation teams will almost inevitably have some
differences in terminology, style guidelines, etc. Environments also have codes
assigned.</para>
+<para>The second level of language-specificity is the "environment". In
linguistic terms this could be whatever distinct but minor variations in
vocabulary, style, tone, or orthography, which are specific to certain groups
of people within a single language community. Within Pology, this level is used
to support variations between specific translation environments, such as
long-standing translation projects and their teams. Although translating into
the same language, translation teams will almost inevitably have some
differences in terminology, style guidelines, etc. Environments also have codes
assigned.</para>
<para>In every application in Pology, the language and its environments have a
hierarchical relation. In general, language-specific elements defined outside
of a specific environment ("environment-agnostic" elements) are a sort of a
relaxed least common denominator, and specific environments add their own
elements to that. Relaxed means that environment-agnostic elements can
sometimes include that which holds for most but not all environments, while
each environment can override what it needs to. This prevents the
environment-agnostic language support from getting too limited just to cater
for perculiarities in certain environments.</para>
@@ -198,7 +198,7 @@ In the usual translation process, an embedded UI label is
manually translated ju
<sect2 id="sec-lguiformat">
<title>Wrapping UI References</title>
-<para>If UI references are inserted into the text informally (even if relying
on certain ortographic or typographic conventions), then they must be manually
wrapped in the translation using an explicit UI reference directive. For
example:
+<para>If UI references are inserted into the text informally (even if relying
on certain orthographic or typographic conventions), then they must be manually
wrapped in the translation using an explicit UI reference directive. For
example:
<programlisting language="po">
#: comic.cpp:466
msgid "Press the \"Get New Comics...\" button to install comics."
diff --git a/doc/user/poformat.docbook b/doc/user/poformat.docbook
index 79767cabd..e5b887022 100644
--- a/doc/user/poformat.docbook
+++ b/doc/user/poformat.docbook
@@ -73,7 +73,7 @@ Based on this example, translating a PO file looks rather
simple, and for the mo
<para>Each message in the previous example also contains the <emphasis>source
reference comment</emphasis>, which is the line starting with
<literal>#:</literal> above the <literal>msgid "..."</literal> line. It tells
from which source file of the program code (or source document of any kind),
and the line in that source file, the message has been extracted into the PO
file. This piece of data may look strange at first--of what use is it to
translators, to merit inclusion in the PO file? Since the PO format has been
developed in context of free software, the source reference enables you to
actually look up the message in the source file, when you need <emphasis>more
context</emphasis> to translate a certain message. This does not require of you
to be a programmer, as source code is frequently readable enough to infer the
message context without actually understanding the code.</para>
-<para>For example, in the translation the text in title position may need to
have a certain grammatical or ortographical form, and it may not be apparent
from the PO file alone if the message:
+<para>For example, in the translation the text in title position may need to
have a certain grammatical or orthographical form, and it may not be apparent
from the PO file alone if the message:
<programlisting language="po">
#: addcatdialog.cpp:45
msgid "Import Catalog"
@@ -518,7 +518,7 @@ Tools that write out PO files usually unconditionally wrap
the text at newlines,
msgid "The \"face\" on Mars"
msgstr "„Lice“ na Marsu"
</programlisting>
-This holds both for double and single quotes. Do check if some particular
quote pairs are prescribed by the ortography of your language, and use them if
they are.</para>
+This holds both for double and single quotes. Do check if some particular
quote pairs are prescribed by the orthography of your language, and use them if
they are.</para>
</sect2>
diff --git a/doc/user/summit.docbook b/doc/user/summit.docbook
index 57777df75..887b45876 100644
--- a/doc/user/summit.docbook
+++ b/doc/user/summit.docbook
@@ -812,7 +812,7 @@ You can see that the complete dependency chain to which
<filename>foobaz_info.po
<sect2 id="sec-sucfghooks">
<title>Summit Hooks</title>
-<para>Summit operations (gather, merge, scatter) are characterized by having
PO files and messages flowing between the summit and branches. It is then
natural to think of adding some <emphasis>filtering</emphasis> into these
flows. For example, on scatter, one could do small ortographic adjustments in
translation, or automatically insert translated UI references.<footnote>
+<para>Summit operations (gather, merge, scatter) are characterized by having
PO files and messages flowing between the summit and branches. It is then
natural to think of adding some <emphasis>filtering</emphasis> into these
flows. For example, on scatter, one could do small orthographic adjustments in
translation, or automatically insert translated UI references.<footnote>
<para>Another possibility are validation filters, which do not modify the text
but report possible problems, though <link linkend="sec-lgrules">validation
rules</link> and <link linkend="sv-check-rules">the
<command>check-rules</command> sieve</link> are likely a better solution.</para>
</footnote></para>
diff --git a/lang/nb/rules/CMakeLists.txt b/lang/nb/rules/CMakeLists.txt
index 72901a469..d5b0a8df9 100644
--- a/lang/nb/rules/CMakeLists.txt
+++ b/lang/nb/rules/CMakeLists.txt
@@ -1,5 +1,5 @@
set(files
- ortography.rules
+ orthography.rules
puretext.filters
)
get_current_source_subdir(srcsubdir)
diff --git a/lang/nb/rules/ortography.rules b/lang/nb/rules/orthography.rules
similarity index 88%
rename from lang/nb/rules/ortography.rules
rename to lang/nb/rules/orthography.rules
index 235707572..733348736 100644
--- a/lang/nb/rules/ortography.rules
+++ b/lang/nb/rules/orthography.rules
@@ -1,4 +1,4 @@
-# Frequent ortography mistakes in Norwegian Nynorsk.
+# Frequent orthography mistakes in Norwegian Nynorsk.
# Karl Ove Hufthammer <[email protected]>
# License: GPLv3
diff --git a/lang/nn/exclusion/README b/lang/nn/exclusion/README
index 597ce15a5..3b21addae 100644
--- a/lang/nn/exclusion/README
+++ b/lang/nn/exclusion/README
@@ -22,7 +22,7 @@
# The file ‘klammeformer.dat’ contains a list of all
# words that were ‘klammeformer’ in the pre-2012
-# Norwegian Nynorsk ortography. It is generated
+# Norwegian Nynorsk orthography. It is generated
# from ‘fullform_nn-r103.txt’ using these commands:
grep -v '^*' fullform_nn-r103.txt > alle.txt
diff --git a/lang/nn/rules/CMakeLists.txt b/lang/nn/rules/CMakeLists.txt
index e5ff13cef..af05ad9ba 100644
--- a/lang/nn/rules/CMakeLists.txt
+++ b/lang/nn/rules/CMakeLists.txt
@@ -5,7 +5,7 @@ set(files
english.rules
grammar.rules
kde.rules
- ortography.rules
+ orthography.rules
puretext.filters
team-choices.rules
technical.rules
diff --git a/lang/nn/rules/ortography.rules b/lang/nn/rules/orthography.rules
similarity index 99%
rename from lang/nn/rules/ortography.rules
rename to lang/nn/rules/orthography.rules
index 1abd2fb23..bbdbb70b5 100644
--- a/lang/nn/rules/ortography.rules
+++ b/lang/nn/rules/orthography.rules
@@ -1,4 +1,4 @@
-# Frequent ortography mistakes in Norwegian Nynorsk.
+# Frequent orthography mistakes in Norwegian Nynorsk.
# Karl Ove Hufthammer <[email protected]>
# License: GPLv3
diff --git a/lang/sr/rules/CMakeLists.txt b/lang/sr/rules/CMakeLists.txt
index 8ac4315df..0e45ec3b9 100644
--- a/lang/sr/rules/CMakeLists.txt
+++ b/lang/sr/rules/CMakeLists.txt
@@ -1,6 +1,6 @@
set(files
domain.rules
- ortography.rules
+ orthography.rules
puretext.filters
techne-kde.rules
terminology-kde.rules
diff --git a/lang/sr/rules/ortography.rules b/lang/sr/rules/orthography.rules
similarity index 89%
rename from lang/sr/rules/ortography.rules
rename to lang/sr/rules/orthography.rules
index 1fafbc571..235cce610 100644
--- a/lang/sr/rules/ortography.rules
+++ b/lang/sr/rules/orthography.rules
@@ -1,4 +1,4 @@
-# Frequent ortography mistakes in Serbian.
+# Frequent orthography mistakes in Serbian.
# Chusslove Illich (Часлав Илић) <[email protected]>
# License: GPLv3
diff --git a/pology/lang/nb/exclusion.py b/pology/lang/nb/exclusion.py
index 79e674011..1ed365a09 100644
--- a/pology/lang/nb/exclusion.py
+++ b/pology/lang/nb/exclusion.py
@@ -1,7 +1,7 @@
# -*- coding: UTF-8 -*
"""
-Catch inofficial ortography forms in Norwegian Bokmål translation.
+Catch inofficial orthography forms in Norwegian Bokmål translation.
The check expects that the translation is plain text,
i.e. that any markup has been removed from it beforehand;
@@ -22,7 +22,7 @@ from pology.split import split_text
def exclude_forms (dictnames):
"""
- Check for excluded ortography forms in translation [hook factory].
+ Check for excluded orthography forms in translation [hook factory].
@param dictnames: base names of files from which to collect excluded forms;
file paths will be assembled as
diff --git a/pology/lang/nn/exclusion.py b/pology/lang/nn/exclusion.py
index b0d76d664..bbac5c148 100644
--- a/pology/lang/nn/exclusion.py
+++ b/pology/lang/nn/exclusion.py
@@ -1,7 +1,7 @@
# -*- coding: UTF-8 -*
"""
-Catch inofficial ortography forms in Norwegian Nynorsk translation.
+Catch inofficial orthography forms in Norwegian Nynorsk translation.
The check expects that the translation is plain text,
i.e. that any markup has been removed from it beforehand;
@@ -22,7 +22,7 @@ from pology.split import split_text
def exclude_forms (dictnames):
"""
- Check for excluded ortography forms in translation [hook factory].
+ Check for excluded orthography forms in translation [hook factory].
@param dictnames: base names of files from which to collect excluded forms;
file paths will be assembled as
diff --git a/pology/lang/sr/nobr.py b/pology/lang/sr/nobr.py
index d99c130f0..4de839f8e 100644
--- a/pology/lang/sr/nobr.py
+++ b/pology/lang/sr/nobr.py
@@ -4,7 +4,7 @@
Equip text with no-break characters where possibly helpful.
The way text is wrapped in UI, by a general wrapping algorithm,
-is sometimes really not appropriate for Serbian ortography.
+is sometimes really not appropriate for Serbian orthography.
For example, hyphen-separated case ending should not be wrapped.
This module contains functions to heuristically replace ordinary
with no-break characters, where such bad breaks can be expected.
diff --git a/pology/proj/kde/header.py b/pology/proj/kde/header.py
index def18c773..e34e82d3d 100644
--- a/pology/proj/kde/header.py
+++ b/pology/proj/kde/header.py
@@ -25,7 +25,7 @@ def equip_header (hdr, cat):
- C{Language}: the language code of translation;
set only if the language can be determined
- C{X-Environment}: linguistic subset of the language of translation
- (team choices on terminology, ortography...);
+ (team choices on terminology, orthography...);
set to C{kde} if not existing, otherwise left untouched.
- C{X-Accelerator-Marker}: accelerator marker character which may
be encountered in text
