From 8d8e059fa29e6f3e553d6e1cb4a410cd26259dd3 Mon Sep 17 00:00:00 2001 From: Andreas Lien <30557582+DiFronzo@users.noreply.github.com> Date: Wed, 21 May 2025 12:24:21 +0000 Subject: [PATCH 1/4] refactor: Enhance UserContribution description with language code for templates from different sites --- ukbot/rules/templateremoval.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ukbot/rules/templateremoval.py b/ukbot/rules/templateremoval.py index c729eda..da64d77 100644 --- a/ukbot/rules/templateremoval.py +++ b/ukbot/rules/templateremoval.py @@ -84,6 +84,17 @@ def test(self, rev): removed = self.get_templates_removed(template, rev) if removed > 0: template['total'] += removed - yield UserContribution(rev=rev, rule=self, points=removed * self.points, - description=_('removal of {{tl|%(template)s}}') % {'template': template['name']}) + # Add language code if template is from a different site + lang_code = '' + if hasattr(template['site'], 'code') and template['site'].code != rev.article().site().code: + lang_code = '|' + template['site'].code + yield UserContribution( + rev=rev, + rule=self, + points=removed * self.points, + description=_('removal of {{tl|%(template)s%(lang)s}}') % { + 'template': template['name'], + 'lang': lang_code + } + ) From 690c60634744c8f92c629e64e8e5021ef256eb9f Mon Sep 17 00:00:00 2001 From: Andreas Lien Date: Wed, 21 May 2025 23:10:26 +0200 Subject: [PATCH 2/4] Update localization files and fix template removal rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Updated POT-Creation-Date in locale files for fi_FI, gl_ES, nb_NO. - Adjusted line numbers for various messages in localization files to reflect code changes. - Corrected translations for several messages in Finnish, Galician, and Norwegian Bokmål. - Fixed the template removal rule to correctly handle language codes in the description. --- locale/ca_ES.po | 122 ++++++++++++++++----------------- locale/es_ES.po | 68 +++++++++--------- locale/eu_ES.po | 101 +++++++++++++-------------- locale/fi_FI.po | 96 +++++++++++++------------- locale/gl_ES.po | 76 ++++++++++---------- locale/messages.pot | 66 +++++++++--------- locale/nb_NO.po | 84 +++++++++++------------ ukbot/rules/templateremoval.py | 9 +-- 8 files changed, 309 insertions(+), 313 deletions(-) diff --git a/locale/ca_ES.po b/locale/ca_ES.po index fca60d1..2f337d4 100644 --- a/locale/ca_ES.po +++ b/locale/ca_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: 2025-04-04 17:56+0200\n" "Last-Translator: Joan Creus \n" "Language-Team: Catalan \n" @@ -32,8 +32,8 @@ msgid "" "There are no point rules defined for this contest. Point rules are defined " "by {{tl|%(template)s}}." msgstr "" -"No hi ha regles de puntuació definides per aquest concurs. Les regles de" -" punts es defineixen amb {{tl|%(template)s}}." +"No hi ha regles de puntuació definides per aquest concurs. Les regles de " +"punts es defineixen amb {{tl|%(template)s}}." #: ukbot/contest.py:228 #, python-format @@ -66,8 +66,8 @@ msgid "" "Failed to parse the %(template)s template: Did not find a site matching the " "site prefix %(prefix)s" msgstr "" -"No s'ha pogut analitzar la plantilla %(template)s: no s'ha trobat un lloc que" -" concordi amb el prefix de lloc %(prefix)s" +"No s'ha pogut analitzar la plantilla %(template)s: no s'ha trobat un lloc " +"que concordi amb el prefix de lloc %(prefix)s" #: ukbot/contest.py:354 ukbot/contest.py:394 #, python-format @@ -76,43 +76,43 @@ msgid "" msgstr "" "No s'ha trobat l'usuari %(user)s passat a la plantilla {{tl|%(template)s}}." -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "Dia" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "Punts" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "%e. %B %Y, %H:%M" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "Actualitzat %(date)s" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "Concurs setmanal de la setmana %(week)d" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "Concurs setmanal de la setmana %(startweek)d–%(endweek)d" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "Salutacions" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "i" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -122,91 +122,90 @@ msgid "" "everything looks fine, [%(link)s click here] (and save) to indicate that I " "can send out the awards at first occasion." msgstr "" -"Ara caldria comprovar si el resultat sembla correcte. Si hi ha missatges" -" d'error al final de la [[%(page)s|pàgina de concurs]], caldria comprovar si" -" les contribucions relacionades amb aquest missatge han rebut el nombre de" -" punts correcte. Comproveu també si hi ha comentaris o queixes a la pàgina de" -" discussió. Si tot sembla que està bé, [%(link)s cliqueu aquí] (i deseu) per" -" indicar que puc enviar els premis de seguida que pugui." - -#: ukbot/contest.py:680 +"Ara caldria comprovar si el resultat sembla correcte. Si hi ha missatges " +"d'error al final de la [[%(page)s|pàgina de concurs]], caldria comprovar si " +"les contribucions relacionades amb aquest missatge han rebut el nombre de " +"punts correcte. Comproveu també si hi ha comentaris o queixes a la pàgina de " +"discussió. Si tot sembla que està bé, [%(link)s cliqueu aquí] (i deseu) per " +"indicar que puc enviar els premis de seguida que pugui." + +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "Gràcies, ~~~~" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "Els premis s'han [%(link)s enviat]." -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "UKBot ha trobat un problema" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." msgstr "" -"Aquest concurs està tancat – gràcies a tothom que hi ha participat! Els" -" premis s'enviaran de seguida que l'organitzador del concurs hagi comprovat" -" els resultats." +"Aquest concurs està tancat – gràcies a tothom que hi ha participat! Els " +"premis s'enviaran de seguida que l'organitzador del concurs hagi comprovat " +"els resultats." -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "Aquest concurs està tancat – gràcies a tothom que hi ha participat!" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " "%(enddate)s." msgstr "" -"Actualitzat per darrera vegada a %(lastupdate)s. El concurs està obert des de" -" %(startdate)s fins " -"%(enddate)s." +"Actualitzat per darrera vegada a %(lastupdate)s. El concurs està obert des " +"de %(startdate)s fins %(enddate)s." -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "UKBot ha trobat els següents problemes amb la pàgina [[%s]]" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "" "No s'han trobat els marcadors de resultats %(start_marker)s i %(end_marker)s" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "No s'ha trobat la secció \"%(section_name)s\"." -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "Actualitzant amb els resultats finals, el concurs queda tancat." -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "Comprovant els resultats i repartint premis" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "Actualitzant" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "El concurs setmanal és: %(link)s" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "suspès des de" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "%A, %H:%M" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "Encara no s'hi han registrat contribucions qualificades" @@ -264,8 +263,8 @@ msgid "" "Could not analyze page %(article)s because the revision %(rev)d could not be " "parsed: %(error)s" msgstr "" -"No s'ha pogut analitzar la pàgina %(article)s perquè la revisió %(rev)d no" -" s'ha pogut analitzar: %(error)s" +"No s'ha pogut analitzar la pàgina %(article)s perquè la revisió %(rev)d no " +"s'ha pogut analitzar: %(error)s" #: ukbot/filters.py:233 msgid "Could not parse the catignore page" @@ -296,10 +295,10 @@ msgid "" "parent revision (%(parentid)s) of size %(size)d, possibly due to unclosed " "tags or templates in that revision." msgstr "" -"Revisió [//%(host)s/w/index.php?diff=prev&oldid=%(revid)s %(revid)s]: La" -" diferència de paraules podria estar malament perquè no s'han trobat paraules" -" a la revisió anterior (%(parentid)s) de mida %(size)d, possiblement per" -" culpa de tags o plantilles mal tancades en aquella revisió." +"Revisió [//%(host)s/w/index.php?diff=prev&oldid=%(revid)s %(revid)s]: La " +"diferència de paraules podria estar malament perquè no s'han trobat paraules " +"a la revisió anterior (%(parentid)s) de mida %(size)d, possiblement per " +"culpa de tags o plantilles mal tancades en aquella revisió." #: ukbot/revision.py:142 #, python-format @@ -309,10 +308,10 @@ msgid "" "(%(words)d) is larger than the byte increase (%(bytes)d). Wrong word counts " "can occur for invalid wiki text." msgstr "" -"Revisió [//%(host)s/w/index.php?diff=prev&oldid=%(revid)s %(revid)s]: La" -" diferència de paraules podria estar malament perquè l'increment en nombre de" -" paraules (%(words)d) és més gran que l'increment en bytes (%(bytes)d). Els" -" errors en comptar paraules poden ser deguts a viquitext incorrecte." +"Revisió [//%(host)s/w/index.php?diff=prev&oldid=%(revid)s %(revid)s]: La " +"diferència de paraules podria estar malament perquè l'increment en nombre de " +"paraules (%(words)d) és més gran que l'increment en bytes (%(bytes)d). Els " +"errors en comptar paraules poden ser deguts a viquitext incorrecte." #: ukbot/sites.py:63 #, python-format @@ -324,21 +323,21 @@ msgstr "La pàgina no existeix: [[%(pagename)s]]" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "No s'ha trobat un site que concordi amb el prefix \"%(key)s\"" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "#REDIRECT [[%s]]" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "Redirigint a %s" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "articles" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "{{Columnes}}\n" @@ -392,10 +391,10 @@ msgstr "secció" msgid "bonus %(words)d words" msgstr "bonificació %(words)d paraules" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" -msgstr "treure {{tl|%(template)s}}" +msgid "removal of {{tl|%(template)s%(lang)s}}" +msgstr "treure {{tl|%(template)s%(lang)s}}" #: ukbot/rules/wikidata.py:47 #, python-format @@ -426,4 +425,3 @@ msgstr "%(count)d declaracions de %(property)s" #, python-format msgid "%(words).f words" msgstr "%(words).f paraules" - diff --git a/locale/es_ES.po b/locale/es_ES.po index 665c7e5..8a205a3 100644 --- a/locale/es_ES.po +++ b/locale/es_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: 2020-11-24 20:36+0100\n" "Last-Translator: Rubén Ojeda \n" "Language: es_ES\n" @@ -78,43 +78,43 @@ msgstr "" "No se pudo encontrar el usuario %(user)s proporcionado a la plantilla {{tl|" "%(template)s}}." -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "Día" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "Puntos" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "%e %B %Y, %H:%M" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "Actualizado %(date)s" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "Concurso semanal de la semana %(week)d" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "Concurso semanal de la semana %(startweek)d–%(endweek)d" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "Atentamente" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "y" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -131,20 +131,20 @@ msgstr "" "discusión. Si todo está bien, [%(link)s haz clic aquí] (y guarda) para " "indicar que puedo enviar los premios en cuanto pueda." -#: ukbot/contest.py:680 +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "Gracias, ~~~~" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "Se han [%(link)s enviado] los premios." -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "UKBot ha encontrado un problema" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." @@ -153,12 +153,12 @@ msgstr "" "participado! Los premios se enviarán en cuanto el organizador del concurso " "haya comprobado los resultados." -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "" "Este concurso ha acabado – ¡gracias a todas las personas que han participado!" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " @@ -167,49 +167,49 @@ msgstr "" "Última actualización %(lastupdate)s. El concurso está abierto desde " "%(startdate)s hasta %(enddate)s." -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "UKBot ha encontrado los siguientes problemas con la página [[%s]]" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "" "Los marcadores de resultados %(start_marker)s y %(end_marker)s no se han " "encontrado" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "No se ha encontrado la sección \"%(section_name)s\"." -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "Actualizando con los resultados finales, el concurso ha acabado." -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "Comprobando los resultados y entregando premios" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "Actualizando" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "El concurso semanal es: %(link)s" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "suspendido desde" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "%A, %H:%M" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "Aún no se han registrado contribuciones calificadas" @@ -329,21 +329,21 @@ msgstr "La página no existe: [[%(pagename)s]]" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "No se ha encontrado un site que concuerde con el prefijo \"%(key)s\"" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "#REDIRECT [[%s]]" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "Redirigiendo a %s" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "artículos" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "{{Columnas}}\n" @@ -397,10 +397,10 @@ msgstr "sección" msgid "bonus %(words)d words" msgstr "%(words)d palabras extra" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" -msgstr "borrado de {{tl|%(template)s}}" +msgid "removal of {{tl|%(template)s%(lang)s}}" +msgstr "borrado de {{tl|%(template)s%(lang)s}}" #: ukbot/rules/wikidata.py:47 #, python-format diff --git a/locale/eu_ES.po b/locale/eu_ES.po index 71f51d6..f03b24c 100644 --- a/locale/eu_ES.po +++ b/locale/eu_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: UKBot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: 2019-09-05 01:57+0200\n" "Last-Translator: Galder Gonzalez \n" "Language-Team: \n" @@ -33,8 +33,8 @@ msgid "" "There are no point rules defined for this contest. Point rules are defined " "by {{tl|%(template)s}}." msgstr "" -"Ez dago puntuazio araurik lehiaketa honetan. Puntuak {{tx|%(template)s}}." -"txantiloiak definitzen ditu." +"Ez dago puntuazio araurik lehiaketa honetan. Puntuak {{tx|" +"%(template)s}}.txantiloiak definitzen ditu." #: ukbot/contest.py:228 #, fuzzy, python-format @@ -72,43 +72,43 @@ msgid "" msgstr "" "Ezin izan da %(user)s wikilaria aurkitu {{tx|%(template)s}} txantiloian." -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "Eguna" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "Puntuak" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "%Y %B %e, %H:%M" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "Azken gaurkotzea: %(date)s" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "Asteroko lehiaketa aste honetan: %(week)d" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "Asteroko lehiaketa aste honetan: %(startweek)d-%(endweek)d" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "Ondo segi" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "eta" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -124,20 +124,20 @@ msgstr "" "denak itxura ona duela, [%(link)s egin klik hemen] (eta gorde) esateko bidal " "ditzakedala jada sariak." -#: ukbot/contest.py:680 +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "Eskerrik asko, ~~~~" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "Sariak [%(link)s bidali dira]." -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "UKBotek arazo bat aurkitu du" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." @@ -145,11 +145,11 @@ msgstr "" "Lehiaketa hau itxita dago - eskerrik asko parte-hartzaile guztiei! Sariak " "emango dira lehiaketaren antolatzaileak emaitzak berrikusten dituenean." -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "Lehiaketa hau itxita dag - eskerrik asko parte-hartzailee guztiei!" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " @@ -158,47 +158,47 @@ msgstr "" "Azken gaurkotzea: %(lastupdate)s. Lehiaketa hau %(startdate)s eta " "%(enddate)s bitarte irekita dago." -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, fuzzy, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "UKBotek honako akatsa aurkitu du artikuluan: [[:%s]]" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "" -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "Azken emaitzekin gaurkotzen, lehiaketa itxiko da." -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "Emaitzak konprobatzen eta sariak ematen" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "Gaurkotzen" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "Aste honetako lehiaketa: %(link)s" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "noiztik suspenditua" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "%A, %H.%M" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "Ez du egin lehiaketa honetarako ekarpen baliagarririk oraindik" @@ -277,8 +277,8 @@ msgstr "Kategoria infinitu lotuar bat aurkitu da: " #, fuzzy msgid "No byte limit (second argument) given" msgstr "" -"Ez zaio byte mugarik eman (bigarren argumentua) {tx|%(template)s|" -"%(firstarg)s}} txantiloiari" +"Ez zaio byte mugarik eman (bigarren argumentua) {tx|%(template)s|%" +"(firstarg)s}} txantiloiari" #: ukbot/filters.py:720 #, python-format @@ -308,8 +308,9 @@ msgid "" msgstr "" "[//%(host)s/w/index.php?diff=prev&oldid=%(revid)s %(revid)s] berrikuspena: " "hitz zenbaketa ezberdintasuna gaizki egon daiteke, hitz kontaketaren aldea " -"(%(words)d) handiagoa delako byte kontaketaren aldea baino (%(bytes)d)." -"Gaizki egindako hitz kontaketa wiki testu okerra dela eta gerta daiteke." +"(%(words)d) handiagoa delako byte kontaketaren aldea baino " +"(%(bytes)d).Gaizki egindako hitz kontaketa wiki testu okerra dela eta gerta " +"daiteke." #: ukbot/sites.py:63 #, python-format @@ -321,21 +322,21 @@ msgstr "" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "#BIRZUZENDU [[%s]]" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "%s orrialdera birzuzentzen" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "artikulu" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "{{Multicol}}\n" @@ -389,10 +390,10 @@ msgstr "" msgid "bonus %(words)d words" msgstr "bonus %(words)d hitz" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" -msgstr "{{tx|%(template)s}} txantiloia kentzea" +msgid "removal of {{tl|%(template)s%(lang)s}}" +msgstr "{{tx|%(template)s%(lang)s}} txantiloia kentzea" #: ukbot/rules/wikidata.py:47 #, python-format @@ -428,18 +429,18 @@ msgstr "%(words).f hitz" #~ msgstr "Lehiaketa honek ez du {{tx|%(template)s}} txantiloia." #~ msgid "" -#~ "Did not find %(week)s+%(year)s or %(start)s+%(end)s in {{tl|" -#~ "%(templates)s}}." +#~ "Did not find %(week)s+%(year)s or %(start)s+%(end)s in {{tl|%" +#~ "(templates)s}}." #~ msgstr "" -#~ "Ez da aurkitu %(week)s+%(year)s edo %(start)s+%(end)s hemen: {{tx|" -#~ "%(templates)s}}." +#~ "Ez da aurkitu %(week)s+%(year)s edo %(start)s+%(end)s hemen: {{tx|%" +#~ "(templates)s}}." #~ msgid "" -#~ "Note that the contest this week is [[%(url)s|{{%(template)s|" -#~ "%(weekarg)s=%(week)s}}]]. Join in!" +#~ "Note that the contest this week is [[%(url)s|{{%(template)s|%(weekarg)s=%" +#~ "(week)s}}]]. Join in!" #~ msgstr "" -#~ "Aste honetako lehiaketa honakoa da: [[%(url)s|{{%(template)s|" -#~ "%(weekarg)s=%(week)s}}]]. Batu!" +#~ "Aste honetako lehiaketa honakoa da: [[%(url)s|{{%(template)s|%(weekarg)s=%" +#~ "(week)s}}]]. Batu!" #~ msgid "max" #~ msgstr "gehienez" @@ -453,8 +454,8 @@ msgstr "%(words).f hitz" #~ msgid "" #~ "No template (second argument) given to {{tlx|%(template)s|%(firstarg)s}}" #~ msgstr "" -#~ "Ez zaio bigarren argumentudun txantiloirik eman {{tx|%(template)s|" -#~ "%(firstarg)s}}" +#~ "Ez zaio bigarren argumentudun txantiloirik eman {{tx|%(template)s|%" +#~ "(firstarg)s}}" #~ msgid "No categories given to {{tlx|%(template)s|%(firstarg)s}}" #~ msgstr "Ez zaio kategoriarik eman {{tx|%(template)s|%(firstarg)s}}" diff --git a/locale/fi_FI.po b/locale/fi_FI.po index 1971e62..2c738d8 100644 --- a/locale/fi_FI.po +++ b/locale/fi_FI.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: UKBot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: 2019-09-05 01:56+0200\n" "Last-Translator: Dan Michael O. Heggø \n" "Language-Team: \n" @@ -72,43 +72,43 @@ msgid "" "Couldn't find the user %(user)s given to the {{tl|%(template)s}} template." msgstr "Ei löydetty käyttäjää %(user)s {{tl|%(template)s}}-mallineesta." -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "Päivä" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "Pisteet" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "%e. %Bta %Y kello %H.%M" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "Päivitetty %(date)s" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "Viikon %(week)d kilpailu" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "Viikkojen %(startweek)d–%(endweek)d kilpailu" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "Terveisin" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "ja" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -124,20 +124,20 @@ msgstr "" "tai valituksia. Jos kaikki näyttää olevan kunnossa, paina [%(link)s tästä] " "(ja tallenna), niin rusetit lähetetään melko nopeasti." -#: ukbot/contest.py:680 +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "Terveisin, ~~~~" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "Rusetit on nyt [%(link)s jaettu]." -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "UKBot havaitsi ongelman" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." @@ -145,11 +145,11 @@ msgstr "" "Tämä kilpailu on päättynyt – kiitos kaikille osallistuneille! Rusetit " "jaetaan heti kun kilpailun järjestäjä on tarkistanut tulokset." -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "Tämä kilpailu on päättynyt – kiitos kaikille osallistuneille!" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " @@ -158,47 +158,47 @@ msgstr "" "Päivitetty viimeksi %(lastupdate)s. Kilpailu on avoinna %(startdate)s – " "%(enddate)s." -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, fuzzy, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "UKBot havaitsi seuraavat ongelmat artikkeliin [[:%s]] liittyen" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "" -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "Lisätään lopulliset tulokset ja merkitään kilpailu päättyneeksi." -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "Tarkistetaan tulokset ja jaetaan rusetit" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "Päivitetään" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "Viikon kilpailu on: %(link)s" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "suspendert siden" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "%A kello %H.%M" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "Hyväksyttyjä muokkauksia ei ole vielä rekisteröity" @@ -280,8 +280,8 @@ msgstr "Jumiutunut loputtomaan luokkasilmukkaan: " #, fuzzy msgid "No byte limit (second argument) given" msgstr "" -"Tavurajaa (toinen argumentti) ei ole annettu kohteeseen {{tlx|%(template)s|" -"%(firstarg)s}}" +"Tavurajaa (toinen argumentti) ei ole annettu kohteeseen {{tlx|%(template)s|%" +"(firstarg)s}}" #: ukbot/filters.py:720 #, python-format @@ -316,22 +316,22 @@ msgstr "" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "#OHJAUS [[%s]]" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "Ohjaus sivulle %s" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "" "%(articlecount)d {{subst:PLURAL:%(articlecount)d|artikkeli|artikkelia}}" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "{{Sarakkeet}}\n" @@ -388,10 +388,10 @@ msgstr "" msgid "bonus %(words)d words" msgstr "bonus %(words)d {{subst:PLURAL:%(words)d|sana|sanaa}}" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" -msgstr "mallineen {{tl|%(template)s}} poisto" +msgid "removal of {{tl|%(template)s%(lang)s}}" +msgstr "mallineen {{tl|%(template)s%(lang)s}} poisto" #: ukbot/rules/wikidata.py:47 #, python-format @@ -427,18 +427,18 @@ msgstr "%(words).f {{subst:PLURAL:%(words).f|sana|sanaa}}" #~ msgstr "Tästä kilpailusta puuttuu {{tl|%(template)s}}-malline." #~ msgid "" -#~ "Did not find %(week)s+%(year)s or %(start)s+%(end)s in {{tl|" -#~ "%(templates)s}}." +#~ "Did not find %(week)s+%(year)s or %(start)s+%(end)s in {{tl|%" +#~ "(templates)s}}." #~ msgstr "" -#~ "Kohteesta {{tl|%(templates)s}} ei ole löydetty %(week)s+%(year)s eikä " -#~ "%(start)s+%(end)s." +#~ "Kohteesta {{tl|%(templates)s}} ei ole löydetty %(week)s+%(year)s eikä %" +#~ "(start)s+%(end)s." #~ msgid "" -#~ "Note that the contest this week is [[%(url)s|{{%(template)s|" -#~ "%(weekarg)s=%(week)s}}]]. Join in!" +#~ "Note that the contest this week is [[%(url)s|{{%(template)s|%(weekarg)s=%" +#~ "(week)s}}]]. Join in!" #~ msgstr "" -#~ "Muista, että tämän viikon kilpailu on [[%(url)s|{{%(template)s|" -#~ "%(weekarg)s=%(week)s}}]]. Onnea matkaan!" +#~ "Muista, että tämän viikon kilpailu on [[%(url)s|{{%(template)s|%" +#~ "(weekarg)s=%(week)s}}]]. Onnea matkaan!" #~ msgid "max" #~ msgstr "maks" @@ -452,8 +452,8 @@ msgstr "%(words).f {{subst:PLURAL:%(words).f|sana|sanaa}}" #~ msgid "" #~ "No template (second argument) given to {{tlx|%(template)s|%(firstarg)s}}" #~ msgstr "" -#~ "Mallineita (toinen argumentti) ei ole annettu kohteeseen {{tlx|" -#~ "%(template)s|%(firstarg)s}}" +#~ "Mallineita (toinen argumentti) ei ole annettu kohteeseen {{tlx|%" +#~ "(template)s|%(firstarg)s}}" #~ msgid "No categories given to {{tlx|%(template)s|%(firstarg)s}}" #~ msgstr "Kohteeseen {{tlx|%(template)s|%(firstarg)s}} ei ole annettu luokkia" @@ -465,8 +465,8 @@ msgstr "%(words).f {{subst:PLURAL:%(words).f|sana|sanaa}}" #~ msgid "Unknown argument given to {{tl|%(template)s}}: %(argument)s" #~ msgstr "" -#~ "Tuntematon argumentti on annettu kohteeseen {{tl|%(template)s}}: " -#~ "%(argument)s" +#~ "Tuntematon argumentti on annettu kohteeseen {{tl|%(template)s}}: %" +#~ "(argument)s" #~ msgid "Found no \"%(section)s\" sections in the page \"%(page)s\"" #~ msgstr "Ei löydettyjä \"%(section)s\"-osioita sivulla \"%(page)s\"" diff --git a/locale/gl_ES.po b/locale/gl_ES.po index 6cc1b34..8e5e115 100644 --- a/locale/gl_ES.po +++ b/locale/gl_ES.po @@ -1,12 +1,12 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Francisco Prieto , 2025. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Francisco Prieto , 2025. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: 2020-11-24 20:36+0100\n" "Last-Translator: Francisco Prieto \n" "Language-Team: Galician \n" @@ -76,43 +76,43 @@ msgstr "" "Non se puido atopar o usuario %(user)s que se pasou ao {{tl|%(template)s}} " "modelo." -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "Día" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "Puntos" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "%e %B %Y, %H:%M" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "Actualizado %(date)s" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "Concurso semanal da semana %(week)d" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "Concurso semanal da semana %(startweek)d–%(endweek)d" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "Atentamente" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "e" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -129,20 +129,20 @@ msgstr "" "pinta, [%(link)s fai clic aquí] (e garda) para sinalar que podo enviar os " "premios tan axiña como sexa posible." -#: ukbot/contest.py:680 +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "Grazas, ~~~~" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "[%(link)s Enviáronse] os premios." -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "UKBot atopou un problema" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." @@ -151,11 +151,11 @@ msgstr "" "premios enviaranse tan axiña como o organizador do concurso comprobe os " "resultados." -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "Este concurso rematou – grazas a todas as persoas que participaron!" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " @@ -164,48 +164,48 @@ msgstr "" "Última actualización %(lastupdate)s. O concurso está aberto dende " "%(startdate)s até %(enddate)s." -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "UKBot atopou os seguintes problemas coa páxina [[%s]]" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "" "Os marcadores de resultados %(start_marker)s e %(end_marker)s non se atoparon" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "Non se atopou a sección \"%(section_name)s\"." -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "Actualizando cos resultados finais, o concurso rematou." -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "Comprobando os resultados e repartindo os premios" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "Actualizando" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "O concurso semanal é: %(link)s" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "suspendido dende" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "%A, %H:%M" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "Aínda non se rexistraron achegas cualificadas" @@ -323,21 +323,21 @@ msgstr "A páxina non existe: [[%(pagename)s]]" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "Non se atopou un site que concorde co prefixo \"%(key)s\"" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "#REDIRECT [[%s]]" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "Redirixindo a %s" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "artigos" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "{{Columnas}}\n" @@ -391,10 +391,10 @@ msgstr "sección" msgid "bonus %(words)d words" msgstr "%(words)d palabras extra" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" -msgstr "borrado de {{tl|%(template)s}}" +msgid "removal of {{tl|%(template)s%(lang)s}}" +msgstr "borrado de {{tl|%(template)s%(lang)s}}" #: ukbot/rules/wikidata.py:47 #, python-format diff --git a/locale/messages.pot b/locale/messages.pot index 250b26b..987974b 100644 --- a/locale/messages.pot +++ b/locale/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,43 +68,43 @@ msgid "" "Couldn't find the user %(user)s given to the {{tl|%(template)s}} template." msgstr "" -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -115,77 +115,77 @@ msgid "" "can send out the awards at first occasion." msgstr "" -#: ukbot/contest.py:680 +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "" -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." msgstr "" -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " "%(enddate)s." msgstr "" -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "" -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "" -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "" @@ -291,21 +291,21 @@ msgstr "" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "" @@ -359,9 +359,9 @@ msgstr "" msgid "bonus %(words)d words" msgstr "" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" +msgid "removal of {{tl|%(template)s%(lang)s}}" msgstr "" #: ukbot/rules/wikidata.py:47 diff --git a/locale/nb_NO.po b/locale/nb_NO.po index a12e82a..d4e05e9 100644 --- a/locale/nb_NO.po +++ b/locale/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: UKBot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-02 15:46+0200\n" +"POT-Creation-Date: 2025-05-21 22:56+0200\n" "PO-Revision-Date: 2025-03-29 13:18+0100\n" "Last-Translator: Jon Harald Søby \n" "Language-Team: Norwegian Bokmal \n" @@ -73,43 +73,43 @@ msgid "" "Couldn't find the user %(user)s given to the {{tl|%(template)s}} template." msgstr "Fant ikke brukeren %(user)s gitt til {{ml|%(template)s}}-malen." -#: ukbot/contest.py:529 +#: ukbot/contest.py:538 msgid "Day" msgstr "Dag" -#: ukbot/contest.py:530 +#: ukbot/contest.py:539 msgid "Points" msgstr "Poeng" -#: ukbot/contest.py:533 ukbot/contest.py:748 ukbot/contest.py:935 -#: ukbot/contest.py:936 ukbot/contest.py:937 +#: ukbot/contest.py:542 ukbot/contest.py:757 ukbot/contest.py:955 +#: ukbot/contest.py:956 ukbot/contest.py:957 msgid "%e. %B %Y, %H:%M" msgstr "%e. %B %Y, %H:%M" -#: ukbot/contest.py:534 +#: ukbot/contest.py:543 #, python-format msgid "Updated %(date)s" msgstr "Oppdatert %(date)s" -#: ukbot/contest.py:569 +#: ukbot/contest.py:578 #, python-format msgid "Weekly contest for week %(week)d" msgstr "Ukens konkurranse uke %(week)d" -#: ukbot/contest.py:571 +#: ukbot/contest.py:580 #, python-format msgid "Weekly contest for week %(startweek)d–%(endweek)d" msgstr "Ukens konkurranse uke %(startweek)d–%(endweek)d" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "Regards" msgstr "Hilsen" -#: ukbot/contest.py:649 +#: ukbot/contest.py:658 msgid "and" msgstr "og" -#: ukbot/contest.py:679 +#: ukbot/contest.py:688 #, python-format msgid "" "Now you must check if the results look ok. If there are error messages at " @@ -125,20 +125,20 @@ msgstr "" "diskusjonssiden. Hvis alt ser greit ut kan du trykke [%(link)s her] (og " "lagre), så sender jeg ut rosetter ved første anledning." -#: ukbot/contest.py:680 +#: ukbot/contest.py:689 msgid "Thanks, ~~~~" msgstr "Hilsen ~~~~" -#: ukbot/contest.py:691 +#: ukbot/contest.py:700 #, python-format msgid "Awards have been [%(link)s sent out]." msgstr "Rosetter er nå [%(link)s sendt ut]." -#: ukbot/contest.py:880 ukbot/ukbot.py:148 ukbot/ukbot.py:151 +#: ukbot/contest.py:889 ukbot/ukbot.py:151 ukbot/ukbot.py:154 msgid "UKBot encountered a problem" msgstr "UKBot støtte på et problem" -#: ukbot/contest.py:930 +#: ukbot/contest.py:950 msgid "" "This contest is closed – thanks to everyone who participated! Awards will be " "sent out as soon as the contest organizer has checked the results." @@ -146,11 +146,11 @@ msgstr "" "Konkurransen er avsluttet – takk til alle som deltok! Rosetter vil sendes ut " "så snart konkurransearrangøren har sjekket resultatene." -#: ukbot/contest.py:932 +#: ukbot/contest.py:952 msgid "This contest is closed – thanks to everyone who participated!" msgstr "Denne konkurransen er avsluttet – takk til alle som deltok!" -#: ukbot/contest.py:939 +#: ukbot/contest.py:959 #, python-format msgid "" "Last updated %(lastupdate)s. The contest is open from %(startdate)s to " @@ -159,48 +159,48 @@ msgstr "" "Sist oppdatert %(lastupdate)s. Konkurransen er åpen fra %(startdate)s til " "%(enddate)s." -#: ukbot/contest.py:960 +#: ukbot/contest.py:980 #, python-format msgid "UKBot encountered the following problems with the page [[%s]]" msgstr "UKBot støtte på problemer med siden [[:%s]]" -#: ukbot/contest.py:994 +#: ukbot/contest.py:1014 #, python-format msgid "Results markers %(start_marker)s and %(end_marker)s not found" msgstr "Resultatmarkørene %(start_marker)s og %(end_marker)s ble ikke funnet" -#: ukbot/contest.py:1005 +#: ukbot/contest.py:1025 #, python-format msgid "No \"%(section_name)s\" section found." msgstr "Ingen seksjon med navn «%(section_name)s» funnet." -#: ukbot/contest.py:1015 +#: ukbot/contest.py:1035 msgid "Updating with final results, the contest is now closed." msgstr "" "Oppdaterer med endelige resultater og merker konkurransen som avsluttet." -#: ukbot/contest.py:1017 +#: ukbot/contest.py:1037 msgid "Checking results and handing out awards" msgstr "Sjekker resultater og deler ut rosetter" -#: ukbot/contest.py:1019 +#: ukbot/contest.py:1039 msgid "Updating" msgstr "Oppdaterer" -#: ukbot/contest.py:1149 +#: ukbot/contest.py:1169 #, python-format msgid "The weekly contest is: %(link)s" msgstr "Ukens konkurranse er: %(link)s" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "suspended since" msgstr "suspendert siden" -#: ukbot/contributions.py:164 ukbot/user.py:674 +#: ukbot/contributions.py:164 ukbot/user.py:672 msgid "%A, %H:%M" msgstr "%A klokka %H.%M" -#: ukbot/contributions.py:178 ukbot/user.py:679 +#: ukbot/contributions.py:178 ukbot/user.py:677 msgid "No qualifying contributions registered yet" msgstr "Ingen kvalifiserte bidrag har blitt registrert enda" @@ -323,21 +323,21 @@ msgstr "Siden finnes ikke: [[%(pagename)s]]" msgid "Could not find a site matching the prefix \"%(key)s\"" msgstr "Kunne ikke finne en wiki som matcher prefikset «%(key)s»" -#: ukbot/ukbot.py:169 +#: ukbot/ukbot.py:172 #, python-format msgid "#REDIRECT [[%s]]" msgstr "#OMDIRIGERING [[%s]]" -#: ukbot/ukbot.py:171 +#: ukbot/ukbot.py:174 #, python-format msgid "Redirecting to %s" msgstr "Omdirigerer til %s" -#: ukbot/user.py:681 +#: ukbot/user.py:679 msgid "articles" msgstr "%(articlecount)d {{subst:PLURAL:%(articlecount)d|artikkel|artikler}}" -#: ukbot/user.py:683 +#: ukbot/user.py:681 msgid "{{Kolonner}}\n" msgstr "{{Kolonner}}\n" @@ -393,10 +393,10 @@ msgstr "seksjon" msgid "bonus %(words)d words" msgstr "bonus %(words)d {{subst:PLURAL:%(words)d|ord}}" -#: ukbot/rules/templateremoval.py:88 +#: ukbot/rules/templateremoval.py:95 #, python-format -msgid "removal of {{tl|%(template)s}}" -msgstr "fjerning av {{ml|%(template)s}}" +msgid "removal of {{tl|%(template)s%(lang)s}}" +msgstr "fjerning av {{ml|%(template)s%(lang)s}}" #: ukbot/rules/wikidata.py:47 #, python-format @@ -456,18 +456,18 @@ msgstr "%(words).f {{subst:PLURAL:%(words).f|ord}}" #~ msgstr "Denne konkurransen mangler en {{tl|%(template)s}}-mal." #~ msgid "" -#~ "Did not find %(week)s+%(year)s or %(start)s+%(end)s in {{tl|" -#~ "%(templates)s}}." +#~ "Did not find %(week)s+%(year)s or %(start)s+%(end)s in {{tl|%" +#~ "(templates)s}}." #~ msgstr "" -#~ "Fant ikke %(week)s+%(year)s eller %(start)s+%(end)s i {{tl|" -#~ "%(templates)s}}." +#~ "Fant ikke %(week)s+%(year)s eller %(start)s+%(end)s i {{tl|%" +#~ "(templates)s}}." #~ msgid "" -#~ "Note that the contest this week is [[%(url)s|{{%(template)s|" -#~ "%(weekarg)s=%(week)s}}]]. Join in!" +#~ "Note that the contest this week is [[%(url)s|{{%(template)s|%(weekarg)s=%" +#~ "(week)s}}]]. Join in!" #~ msgstr "" -#~ "Husk at denne ukens konkurranse er [[%(url)s|{{%(template)s|" -#~ "%(weekarg)s=%(week)s}}]]. Lykke til!" +#~ "Husk at denne ukens konkurranse er [[%(url)s|{{%(template)s|%(weekarg)s=%" +#~ "(week)s}}]]. Lykke til!" #~ msgid "max" #~ msgstr "maks" diff --git a/ukbot/rules/templateremoval.py b/ukbot/rules/templateremoval.py index da64d77..9c9d8a4 100644 --- a/ukbot/rules/templateremoval.py +++ b/ukbot/rules/templateremoval.py @@ -86,15 +86,12 @@ def test(self, rev): template['total'] += removed # Add language code if template is from a different site lang_code = '' - if hasattr(template['site'], 'code') and template['site'].code != rev.article().site().code: - lang_code = '|' + template['site'].code + if 'lang' in template['site'].site and template['site'].site['lang'] != self.sites.homesite.site['lang']: + lang_code = '|' + template['site'].site['lang'] yield UserContribution( rev=rev, rule=self, points=removed * self.points, - description=_('removal of {{tl|%(template)s%(lang)s}}') % { - 'template': template['name'], - 'lang': lang_code - } + description=_('removal of {{tl|%(template)s%(lang)s}}') % {'template': template['name'], 'lang': lang_code} ) From 91deb32c22517225f17ac5ca4c0963d11839686a Mon Sep 17 00:00:00 2001 From: Andreas Lien <30557582+DiFronzo@users.noreply.github.com> Date: Fri, 21 Nov 2025 19:55:00 +0100 Subject: [PATCH 3/4] Update ukbot/rules/templateremoval.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jon Harald Søby --- ukbot/rules/templateremoval.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukbot/rules/templateremoval.py b/ukbot/rules/templateremoval.py index 9c9d8a4..6ac0cda 100644 --- a/ukbot/rules/templateremoval.py +++ b/ukbot/rules/templateremoval.py @@ -92,6 +92,6 @@ def test(self, rev): rev=rev, rule=self, points=removed * self.points, - description=_('removal of {{tl|%(template)s%(lang)s}}') % {'template': template['name'], 'lang': lang_code} + description=_('removal of [[%(lang)sTemplate:%(template)s]]') % {'template': template['name'], 'lang': lang_code} ) From b62613018e8fa763a2fca6c1a026f5b9d01a3c8c Mon Sep 17 00:00:00 2001 From: Andreas Lien <30557582+DiFronzo@users.noreply.github.com> Date: Fri, 21 Nov 2025 19:55:10 +0100 Subject: [PATCH 4/4] Update ukbot/rules/templateremoval.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jon Harald Søby --- ukbot/rules/templateremoval.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukbot/rules/templateremoval.py b/ukbot/rules/templateremoval.py index 6ac0cda..510e771 100644 --- a/ukbot/rules/templateremoval.py +++ b/ukbot/rules/templateremoval.py @@ -87,7 +87,7 @@ def test(self, rev): # Add language code if template is from a different site lang_code = '' if 'lang' in template['site'].site and template['site'].site['lang'] != self.sites.homesite.site['lang']: - lang_code = '|' + template['site'].site['lang'] + lang_code = template['site'].site['lang'] + ':' yield UserContribution( rev=rev, rule=self,