Description: Spelling error fixes. s/uknown/unknown/g s/tranfered/transferred/g Author: Tobias Frost Bug: Forwarded: Applied-Upstream: Reviewed-by: Last-Update: 2022-08-31 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/common/networking/packets.def +++ b/common/networking/packets.def @@ -154,7 +154,7 @@ Syntax: possible. The array size in the "[]" can be specified plain as a term. In this case all elements will be transmitted. If this is not-desired you can specify the amount of elements to be - transfered by given the number. So the extended format is + transferred by given the number. So the extended format is "[:]". elements-to-transfer is relative to the packet. --- a/doc/README.delta +++ b/doc/README.delta @@ -17,11 +17,11 @@ version exists the unchanged fields will be assumed to be zero. For bool field another optimization called bool-header-folding is applied. Instead of sending an indicator in the bitvector if the given bool values has changed (and so using 1 byte for the real value) the -actual value of the bool is transfered in the bitvector bit of this +actual value of the bool is transferred in the bitvector bit of this bool field. Another optimization called array-diff is used to reduce the amount of -elements transfered if an array is changed. This is independent of the +elements transferred if an array is changed. This is independent of the delta-header bit i.e. it will only be used if the array has changed its value and the bit indicates this. Instead of transferring the whole array only a list of (index, new value of this index) pairs are @@ -45,7 +45,7 @@ To further reduce the network traffic the (delta) packets are compressed using the DEFLATE compression algorithm. To get better compression results multiple packets are grouped together and compressed into a chunk. This chunk is then -transfered as a normal packet. A chunk packet starts with the 2 byte +transferred as a normal packet. A chunk packet starts with the 2 byte length field which every packet has. A chunk packet has no type. A chunk packet is identified by having a too large length field. If the length of the packet is over COMPRESSION_BORDER it is a chunk --- a/server/ruleset.c +++ b/server/ruleset.c @@ -1289,7 +1289,7 @@ static bool load_ruleset_techs(struct section_file *file, classname = Q_(classname); a->tclass = tech_class_by_rule_name(classname); if (a->tclass == NULL) { - ruleset_error(LOG_ERROR, "\"%s\" [%s] \"%s\": Uknown tech class \"%s\".", + ruleset_error(LOG_ERROR, "\"%s\" [%s] \"%s\": Unknown tech class \"%s\".", filename, sec_name, rule_name_get(&a->name), classname); ok = FALSE; break; --- a/server/settings.c +++ b/server/settings.c @@ -1915,7 +1915,7 @@ static struct setting settings[] = { SSET_RULES, SSET_SCIENCE, SSET_RARE, ALLOW_NONE, ALLOW_BASIC, N_("Allow researching multiple technologies"), N_("Allows switching to any technology without wasting old " - "research. Bulbs are never transfered to new technology. " + "research. Bulbs are never transferred to new technology. " "Techpenalty options are inefective after enabling that " "option."), NULL, NULL, GAME_DEFAULT_MULTIRESEARCH) --- a/server/techtools.c +++ b/server/techtools.c @@ -59,7 +59,7 @@ static Tech_type_id pick_random_tech(const struct research *presearch); static Tech_type_id pick_cheapest_tech(const struct research *presearch); static void research_tech_lost(struct research *presearch, Tech_type_id tech); -static void forget_tech_transfered(struct player *pplayer, Tech_type_id tech); +static void forget_tech_transferred(struct player *pplayer, Tech_type_id tech); /**************************************************************************** Apply a penalty to the research. @@ -1351,7 +1351,7 @@ void give_immediate_free_tech(struct research *presearch, Tech_type_id tech) /**************************************************************************** Let the player forget one tech. ****************************************************************************/ -static void forget_tech_transfered(struct player *pplayer, Tech_type_id tech) +static void forget_tech_transferred(struct player *pplayer, Tech_type_id tech) { struct research *presearch = research_get(pplayer); @@ -1393,7 +1393,7 @@ bool tech_transfer(struct player *plr_recv, struct player *plr_donor, } } advance_index_iterate_end; if (donor_can_lose && fc_rand(100) < game.server.techlost_donor) { - forget_tech_transfered(plr_donor, tech); + forget_tech_transferred(plr_donor, tech); } } @@ -1401,7 +1401,7 @@ bool tech_transfer(struct player *plr_recv, struct player *plr_donor, struct research *presearch = research_get(plr_recv); /* We've not received the tech yet, and never will. - * Do not call forget_tech_transfered() that would handle it + * Do not call forget_tech_transferred() that would handle it * as something we had and now lose. * (e.g. subtracting techs_researched counter) */ notify_player(plr_recv, NULL, E_TECH_LOST, ftc_server, --- a/translations/core/ar.po +++ b/translations/core/ar.po @@ -44270,7 +44270,7 @@ msgstr "لا تستطيع بحث هذه التكنولوجيا." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/bg.po +++ b/translations/core/bg.po @@ -41843,7 +41843,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/ca.po +++ b/translations/core/ca.po @@ -46823,7 +46823,7 @@ msgstr "Permet de fer recerca en múltiples tecnologies." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" "Permet de canviar a qualsevol tecnologia sense malbaratar la recerca que " --- a/translations/core/cs.po +++ b/translations/core/cs.po @@ -44711,7 +44711,7 @@ msgstr "Nemůžeme zkoumat tuto technologii." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/da.po +++ b/translations/core/da.po @@ -46837,7 +46837,7 @@ msgstr "Du kan ikke forske i denne teknologi." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/de.po +++ b/translations/core/de.po @@ -47377,7 +47377,7 @@ msgstr "Sie können diese Technologie nicht erforschen." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/el.po +++ b/translations/core/el.po @@ -45199,7 +45199,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/en_GB.po +++ b/translations/core/en_GB.po @@ -46052,7 +46052,7 @@ msgstr "You cannot research this technology." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/eo.po +++ b/translations/core/eo.po @@ -42738,7 +42738,7 @@ msgstr "Vi ne povas studi tiun ĉi teĥnologion." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/es.po +++ b/translations/core/es.po @@ -47885,7 +47885,7 @@ msgstr "No puedes investigar este avance." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/et.po +++ b/translations/core/et.po @@ -44924,7 +44924,7 @@ msgstr "Seda teadust sa ei saa uurida." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/fa.po +++ b/translations/core/fa.po @@ -42457,7 +42457,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/fi.po +++ b/translations/core/fi.po @@ -46654,7 +46654,7 @@ msgstr "Salli useiden teknologioiden tutkiminen rinnakkain" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" "Sallii vaihtaa toiseen teknologiaan hukkaamatta edellisen eteen tehtyä " --- a/translations/core/fr.po +++ b/translations/core/fr.po @@ -47308,7 +47308,7 @@ msgstr "Permet de rechercher plusieurs technologies." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" "Permet de changer de technologie sans perdre l'ancienne recherche. Les " --- a/translations/core/freeciv-core.pot +++ b/translations/core/freeciv-core.pot @@ -40246,7 +40246,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/ga.po +++ b/translations/core/ga.po @@ -43054,7 +43054,7 @@ msgstr "Ní féidir leat taighde a dhéanamh ar an teicneolaíocht seo." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/gd.po +++ b/translations/core/gd.po @@ -48929,7 +48929,7 @@ msgstr "Chan urrainn dhut an teicneolas seo a rannsachadh." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/he.po +++ b/translations/core/he.po @@ -43067,7 +43067,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/hu.po +++ b/translations/core/hu.po @@ -44456,7 +44456,7 @@ msgstr "Nem tudod ezt a technológiát kutatni." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/id.po +++ b/translations/core/id.po @@ -42382,7 +42382,7 @@ msgstr "Anda tidak dapat mempelajari teknologi ini." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/it.po +++ b/translations/core/it.po @@ -46639,7 +46639,7 @@ msgstr "Non puoi ricercare questa tecnologia." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/ja.po +++ b/translations/core/ja.po @@ -47664,7 +47664,7 @@ msgstr "この科学技術は研究できません。" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/ko.po +++ b/translations/core/ko.po @@ -44233,7 +44233,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/lt.po +++ b/translations/core/lt.po @@ -44094,7 +44094,7 @@ msgstr "Jūs negalite išrasti šios technologijos." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/nb.po +++ b/translations/core/nb.po @@ -44755,7 +44755,7 @@ msgstr "Du kan ikke forske på denne teknologien." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/nl.po +++ b/translations/core/nl.po @@ -45594,7 +45594,7 @@ msgstr "U kunt deze technologie niet onderzoeken." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/pl.po +++ b/translations/core/pl.po @@ -46594,7 +46594,7 @@ msgstr "Pozwól na pracę nad wieloma technologiami" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" "Pozwala na przełączenie się na dowolną technologię bez utraty zdobytych " --- a/translations/core/pt.po +++ b/translations/core/pt.po @@ -44424,7 +44424,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/pt_BR.po +++ b/translations/core/pt_BR.po @@ -46950,7 +46950,7 @@ msgstr "Você não pode pesquisar esta tecnologia." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/ro.po +++ b/translations/core/ro.po @@ -44755,7 +44755,7 @@ msgstr "Nu puteţi cerceta această tehnologie." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/ru.po +++ b/translations/core/ru.po @@ -47184,7 +47184,7 @@ msgstr "Исследование нескольких технологий" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" "Позволяет переключаться на исследование любой другой технологии без потери " --- a/translations/core/sr.po +++ b/translations/core/sr.po @@ -42452,7 +42452,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/sv.po +++ b/translations/core/sv.po @@ -45102,7 +45102,7 @@ msgstr "Vi kan inte forska fram denna teknologi." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/tr.po +++ b/translations/core/tr.po @@ -44380,7 +44380,7 @@ msgstr "Bu teknolojiyi araştıramazsınız." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/uk.po +++ b/translations/core/uk.po @@ -48200,7 +48200,7 @@ msgstr "Ви не можете винайти цю технологію." #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/zh_CN.po +++ b/translations/core/zh_CN.po @@ -43152,7 +43152,7 @@ msgstr "允许研究多项科技" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr "" --- a/translations/core/zh_TW.po +++ b/translations/core/zh_TW.po @@ -41341,7 +41341,7 @@ msgstr "" #: server/settings.c:1917 msgid "" "Allows switching to any technology without wasting old research. Bulbs are " -"never transfered to new technology. Techpenalty options are inefective after " +"never transferred to new technology. Techpenalty options are inefective after " "enabling that option." msgstr ""