diff options
| -rw-r--r-- | language/anope.en_US.po | 114 | ||||
| -rw-r--r-- | language/anope.fr_FR.po | 118 | ||||
| -rw-r--r-- | modules/botserv/bs_info.cpp | 2 | ||||
| -rw-r--r-- | modules/memoserv/memoserv.cpp | 2 | ||||
| -rw-r--r-- | modules/nickserv/ns_group.cpp | 2 | ||||
| -rw-r--r-- | modules/operserv/os_forbid.cpp | 2 | ||||
| -rw-r--r-- | src/misc.cpp | 14 |
7 files changed, 127 insertions, 127 deletions
diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 2ab5b4a4c..b188270d3 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-22 15:31+0000\n" +"POT-Creation-Date: 2024-11-25 01:18+0000\n" "PO-Revision-Date: 2024-11-13 02:45+0000\n" "Last-Translator: Sadie Powell <sadie@witchery.services>\n" "Language-Team: English\n" @@ -23,6 +23,12 @@ msgid "%d channel(s) cleared, and %d channel(s) dropped." msgstr "" #, c-format +msgid "%d nickname dropped." +msgid_plural "%d nicknames dropped." +msgstr[0] "" +msgstr[1] "" + +#, c-format msgid "%s added to %s %s list." msgstr "" @@ -350,12 +356,6 @@ msgstr "" msgid "%s HELP %s for more information." msgstr "" -#, c-format -msgid "1 nickname dropped." -msgid_plural "%d nicknames dropped." -msgstr[0] "" -msgstr[1] "" - msgid "ADD nick user host real " msgstr "" @@ -1038,6 +1038,36 @@ msgid "%d modules loaded." msgstr "" #, c-format +msgid "%lld day" +msgid_plural "%lld days" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "%lld hour" +msgid_plural "%lld hours" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "%lld minute" +msgid_plural "%lld minutes" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "%lld second" +msgid_plural "%lld seconds" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "%lld year" +msgid_plural "%lld years" +msgstr[0] "" +msgstr[1] "" + +#, c-format msgid "%lu nicks are stored in the database, using %.2Lf kB of memory." msgstr "" @@ -1364,6 +1394,18 @@ msgid "%s's memo limit is %d." msgstr "" #, c-format +msgid "%u channel" +msgid_plural "%u channels" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "%zu nickname in the group." +msgid_plural "%zu nicknames in the group." +msgstr[0] "" +msgstr[1] "" + +#, c-format msgid "(%s ago)" msgstr "" @@ -1427,48 +1469,6 @@ msgstr "" msgid ". %s is still online." msgstr "" -#, c-format -msgid "1 channel" -msgid_plural "%u channels" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "1 day" -msgid_plural "%lld days" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "1 hour" -msgid_plural "%lld hours" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "1 minute" -msgid_plural "%lld minutes" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "1 nickname in the group." -msgid_plural "%zu nicknames in the group." -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "1 second" -msgid_plural "%lld seconds" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "1 year" -msgid_plural "%lld years" -msgstr[0] "" -msgstr[1] "" - msgid "<unknown>" msgstr "" @@ -6986,7 +6986,7 @@ msgid "You found me, %s!" msgstr "" #, c-format -msgid "You have 1 new memo." +msgid "You have %d new memo." msgid_plural "You have %d new memos." msgstr[0] "" msgstr[1] "" @@ -7379,6 +7379,12 @@ msgid "does not expire" msgstr "" #, c-format +msgid "expires in %d day" +msgid_plural "expires in %d days" +msgstr[0] "" +msgstr[1] "" + +#, c-format msgid "expires in %d hour, %d minute" msgstr "" @@ -7395,13 +7401,7 @@ msgid "expires in %d hours, %d minutes" msgstr "" #, c-format -msgid "expires in 1 day" -msgid_plural "expires in %d days" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "expires in 1 minute" +msgid "expires in %d minute" msgid_plural "expires in %d minutes" msgstr[0] "" msgstr[1] "" diff --git a/language/anope.fr_FR.po b/language/anope.fr_FR.po index b450ad917..0e85e48c3 100644 --- a/language/anope.fr_FR.po +++ b/language/anope.fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-22 21:32+0100\n" +"POT-Creation-Date: 2024-11-25 01:18+0000\n" "PO-Revision-Date: 2024-11-22 21:32+0100\n" "Last-Translator: Val Lorentz <progval+git@progval.net>\n" "Language-Team: French\n" @@ -23,6 +23,12 @@ msgid "%d channel(s) cleared, and %d channel(s) dropped." msgstr "%d canau(x) vidé(s) et %d canau(x) supprimé(s)." #, c-format +msgid "%d nickname dropped." +msgid_plural "%d nicknames dropped." +msgstr[0] "%d pseudo effacé." +msgstr[1] "%d pseudos effacés." + +#, c-format msgid "%s added to %s %s list." msgstr "%1$s ajouté à la liste des %3$s de %2$s." @@ -390,12 +396,6 @@ msgstr "%s est ignoré(e) définitivement." msgid "%s HELP %s for more information." msgstr "%s HELP %s pour plus d'informations." -#, c-format -msgid "1 nickname dropped." -msgid_plural "%d nicknames dropped." -msgstr[0] "1 pseudo effacé." -msgstr[1] "%d pseudos effacés." - msgid "ADD nick user host real " msgstr "ADD pseudo user host realname " @@ -1297,6 +1297,36 @@ msgid "%d modules loaded." msgstr "%d modules chargés." #, c-format +msgid "%lld day" +msgid_plural "%lld days" +msgstr[0] "%lld jour" +msgstr[1] "%lld jours" + +#, c-format +msgid "%lld hour" +msgid_plural "%lld hours" +msgstr[0] "%lld heure" +msgstr[1] "%lld heures" + +#, c-format +msgid "%lld minute" +msgid_plural "%lld minutes" +msgstr[0] "%lld minute" +msgstr[1] "%lld minutes" + +#, c-format +msgid "%lld second" +msgid_plural "%lld seconds" +msgstr[0] "%lld seconde" +msgstr[1] "%lld secondes" + +#, c-format +msgid "%lld year" +msgid_plural "%lld years" +msgstr[0] "%lld année" +msgstr[1] "%lld années" + +#, c-format msgid "%lu nicks are stored in the database, using %.2Lf kB of memory." msgstr "%lu pseudos sont stockés dans la base de données, utilisant %.2Lf ko de mémoire." @@ -1625,6 +1655,18 @@ msgid "%s's memo limit is %d." msgstr "La limite de mémos de %s est de %d." #, c-format +msgid "%u channel" +msgid_plural "%u channels" +msgstr[0] "%u canal" +msgstr[1] "%u canaux" + +#, c-format +msgid "%zu nickname in the group." +msgid_plural "%zu nicknames in the group." +msgstr[0] "%zu pseudo dans le groupe." +msgstr[1] "%zu pseudos dans le groupe." + +#, c-format msgid "(%s ago)" msgstr "(il y a %s)" @@ -1688,48 +1730,6 @@ msgstr ", mais %s s'est mystérieusement dématérialisé." msgid ". %s is still online." msgstr "%s est toujours connecté(e)." -#, c-format -msgid "1 channel" -msgid_plural "%u channels" -msgstr[0] "1 canal" -msgstr[1] "%u canaux" - -#, c-format -msgid "1 day" -msgid_plural "%lld days" -msgstr[0] "1 jour" -msgstr[1] "%lld jours" - -#, c-format -msgid "1 hour" -msgid_plural "%lld hours" -msgstr[0] "1 heure" -msgstr[1] "%lld heures" - -#, c-format -msgid "1 minute" -msgid_plural "%lld minutes" -msgstr[0] "1 minute" -msgstr[1] "%lld minutes" - -#, c-format -msgid "1 nickname in the group." -msgid_plural "%zu nicknames in the group." -msgstr[0] "1 pseudo dans le groupe." -msgstr[1] "%zu pseudos dans le groupe." - -#, c-format -msgid "1 second" -msgid_plural "%lld seconds" -msgstr[0] "1 seconde" -msgstr[1] "%lld secondes" - -#, c-format -msgid "1 year" -msgid_plural "%lld years" -msgstr[0] "1 année" -msgstr[1] "%lld années" - msgid "<unknown>" msgstr "<inconnu>" @@ -8539,9 +8539,9 @@ msgid "You found me, %s!" msgstr "Vous m'avez trouvé, %s !" #, c-format -msgid "You have 1 new memo." +msgid "You have %d new memo." msgid_plural "You have %d new memos." -msgstr[0] "Vous avez 1 nouveau mémo." +msgstr[0] "Vous avez %d nouveau mémo." msgstr[1] "Vous avez %d nouveaux mémos." #, c-format @@ -8937,6 +8937,12 @@ msgid "does not expire" msgstr "n'expire pas" #, c-format +msgid "expires in %d day" +msgid_plural "expires in %d days" +msgstr[0] "expire dans %d jour" +msgstr[1] "expire dans %d jours" + +#, c-format msgid "expires in %d hour, %d minute" msgstr "expire dans %d heure, %d minute" @@ -8953,15 +8959,9 @@ msgid "expires in %d hours, %d minutes" msgstr "expire dans %d heures, %d minutes" #, c-format -msgid "expires in 1 day" -msgid_plural "expires in %d days" -msgstr[0] "expire dans 1 jour" -msgstr[1] "expire dans %d jours" - -#, c-format -msgid "expires in 1 minute" +msgid "expires in %d minute" msgid_plural "expires in %d minutes" -msgstr[0] "expire dans 1 minute" +msgstr[0] "expire dans %d minute" msgstr[1] "expire dans %d minutes" msgid "expires momentarily" diff --git a/modules/botserv/bs_info.cpp b/modules/botserv/bs_info.cpp index 91aa2fc7e..325825a8e 100644 --- a/modules/botserv/bs_info.cpp +++ b/modules/botserv/bs_info.cpp @@ -55,7 +55,7 @@ public: info[_("Real name")] = bi->realname; info[_("Created")] = Anope::strftime(bi->created, source.GetAccount()); info[_("Options")] = bi->oper_only ? _("Private") : _("None"); - info[_("Used on")] = Anope::printf(Language::Translate(source.nc, N_("1 channel", "%u channels")), bi->GetChannelCount()); + info[_("Used on")] = Anope::printf(Language::Translate(source.nc, N_("%u channel", "%u channels")), bi->GetChannelCount()); FOREACH_MOD(OnBotInfo, (source, bi, ci, info)); diff --git a/modules/memoserv/memoserv.cpp b/modules/memoserv/memoserv.cpp index 4b005eaf5..957d6dd32 100644 --- a/modules/memoserv/memoserv.cpp +++ b/modules/memoserv/memoserv.cpp @@ -139,7 +139,7 @@ public: if (nc->memos.GetMemo(i)->unread) ++newcnt; if (newcnt > 0) - u->SendMessage(MemoServ, newcnt, N_("You have 1 new memo.", "You have %d new memos."), newcnt); + u->SendMessage(MemoServ, newcnt, N_("You have %d new memo.", "You have %d new memos."), newcnt); if (nc->memos.memomax > 0 && nc->memos.memos->size() >= static_cast<unsigned>(nc->memos.memomax)) { if (nc->memos.memos->size() > static_cast<unsigned>(nc->memos.memomax)) diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp index 3ccba782c..54ee210b7 100644 --- a/modules/nickserv/ns_group.cpp +++ b/modules/nickserv/ns_group.cpp @@ -356,7 +356,7 @@ public: for (const auto &reply : replies) source.Reply(reply); - source.Reply(nc->aliases->size(), N_("1 nickname in the group.", "%zu nicknames in the group."), nc->aliases->size()); + source.Reply(nc->aliases->size(), N_("%zu nickname in the group.", "%zu nicknames in the group."), nc->aliases->size()); } bool OnHelp(CommandSource &source, const Anope::string &subcommand) override diff --git a/modules/operserv/os_forbid.cpp b/modules/operserv/os_forbid.cpp index 374e04648..7f7881420 100644 --- a/modules/operserv/os_forbid.cpp +++ b/modules/operserv/os_forbid.cpp @@ -292,7 +292,7 @@ public: delete na; } - source.Reply(na_matches, N_("\0021\002 nickname dropped.", "\002%d\002 nicknames dropped."), na_matches); + source.Reply(na_matches, N_("\002%d\002 nickname dropped.", "\002%d\002 nicknames dropped."), na_matches); break; } case FT_CHAN: diff --git a/src/misc.cpp b/src/misc.cpp index 0e234db63..6cf83c3f1 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -311,27 +311,27 @@ Anope::string Anope::Duration(time_t t, const NickCore *nc) Anope::string buffer; if (years) { - buffer = Anope::printf(Language::Translate(nc, years, N_("1 year", "%lld years")), (long long)years); + buffer = Anope::printf(Language::Translate(nc, years, N_("%lld year", "%lld years")), (long long)years); } if (days) { buffer += buffer.empty() ? "" : ", "; - buffer += Anope::printf(Language::Translate(nc, days, N_("1 day", "%lld days")), (long long)days); + buffer += Anope::printf(Language::Translate(nc, days, N_("%lld day", "%lld days")), (long long)days); } if (hours) { buffer += buffer.empty() ? "" : ", "; - buffer += Anope::printf(Language::Translate(nc, hours, N_("1 hour", "%lld hours")), (long long)hours); + buffer += Anope::printf(Language::Translate(nc, hours, N_("%lld hour", "%lld hours")), (long long)hours); } if (minutes) { buffer += buffer.empty() ? "" : ", "; - buffer += Anope::printf(Language::Translate(nc, minutes, N_("1 minute", "%lld minutes")), (long long)minutes); + buffer += Anope::printf(Language::Translate(nc, minutes, N_("%lld minute", "%lld minutes")), (long long)minutes); } if (seconds || buffer.empty()) { buffer += buffer.empty() ? "" : ", "; - buffer += Anope::printf(Language::Translate(nc, seconds, N_("1 second", "%lld seconds")), (long long)seconds); + buffer += Anope::printf(Language::Translate(nc, seconds, N_("%lld second", "%lld seconds")), (long long)seconds); } return buffer; } @@ -365,14 +365,14 @@ Anope::string Anope::Expires(time_t expires, const NickCore *nc) if (diff >= 86400) { int days = diff / 86400; - snprintf(buf, sizeof(buf), Language::Translate(nc, days, N_("expires in 1 day", "expires in %d days")), days); + snprintf(buf, sizeof(buf), Language::Translate(nc, days, N_("expires in %d day", "expires in %d days")), days); } else { if (diff <= 3600) { int minutes = diff / 60; - snprintf(buf, sizeof(buf), Language::Translate(nc, minutes, N_("expires in 1 minute", "expires in %d minutes")), minutes); + snprintf(buf, sizeof(buf), Language::Translate(nc, minutes, N_("expires in %d minute", "expires in %d minutes")), minutes); } else { |