diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp index 64d52f60..c3322a1e 100644 --- a/modules/buffextras.cpp +++ b/modules/buffextras.cpp @@ -111,4 +111,5 @@ void TModInfo(CModInfo& Info) { Info.AddType(CModInfo::NetworkModule); } -USERMODULEDEFS(CBuffExtras, t_s("Add joins, parts etc. to the playback buffer")) +USERMODULEDEFS(CBuffExtras, + t_s("Adds joins, parts etc. to the playback buffer")) diff --git a/modules/certauth.cpp b/modules/certauth.cpp index e668540d..43264526 100644 --- a/modules/certauth.cpp +++ b/modules/certauth.cpp @@ -28,19 +28,16 @@ class CSSLClientCertMod : public CModule { public: MODCONSTRUCTOR(CSSLClientCertMod) { AddHelpCommand(); - AddCommand("Add", static_cast( - &CSSLClientCertMod::HandleAddCommand), - "[pubkey]", - "If pubkey is not provided will use the current key"); - AddCommand("Del", static_cast( - &CSSLClientCertMod::HandleDelCommand), - "id"); - AddCommand("List", static_cast( - &CSSLClientCertMod::HandleListCommand), - "", "List your public keys"); - AddCommand("Show", static_cast( - &CSSLClientCertMod::HandleShowCommand), - "", "Print your current key"); + AddCommand("Add", t_d("[pubkey]"), + t_d("Add a public key. If key is not provided " + "will use the current key"), + [=](const CString& sLine) { HandleAddCommand(sLine); }); + AddCommand("Del", t_d("id"), t_d("Delete a key by its number in List"), + [=](const CString& sLine) { HandleDelCommand(sLine); }); + AddCommand("List", "", t_d("List your public keys"), + [=](const CString& sLine) { HandleListCommand(sLine); }); + AddCommand("Show", "", t_d("Print your current key"), + [=](const CString& sLine) { HandleShowCommand(sLine); }); } ~CSSLClientCertMod() override {} @@ -142,9 +139,9 @@ class CSSLClientCertMod : public CModule { const CString sPubKey = GetKey(GetClient()); if (sPubKey.empty()) { - PutModule("You are not connected with any valid public key"); + PutModule(t_s("You are not connected with any valid public key")); } else { - PutModule("Your current public key is: " + sPubKey); + PutModule(t_f("Your current public key is: {1}")(sPubKey)); } } @@ -156,12 +153,13 @@ class CSSLClientCertMod : public CModule { } if (sPubKey.empty()) { - PutModule("You did not supply a public key or connect with one."); + PutModule( + t_s("You did not supply a public key or connect with one.")); } else { if (AddKey(GetUser(), sPubKey)) { - PutModule("'" + sPubKey + "' added."); + PutModule(t_f("Key '{1}' added.")(sPubKey)); } else { - PutModule("The key '" + sPubKey + "' is already added."); + PutModule(t_f("The key '{1}' is already added.")(sPubKey)); } } } @@ -169,26 +167,26 @@ class CSSLClientCertMod : public CModule { void HandleListCommand(const CString& sLine) { CTable Table; - Table.AddColumn("Id"); - Table.AddColumn("Key"); + Table.AddColumn(t_s("Id", "list")); + Table.AddColumn(t_s("Key", "list")); MSCString::const_iterator it = m_PubKeys.find(GetUser()->GetUserName()); if (it == m_PubKeys.end()) { - PutModule("No keys set for your user"); + PutModule(t_s("No keys set for your user")); return; } unsigned int id = 1; for (const CString& sKey : it->second) { Table.AddRow(); - Table.SetCell("Id", CString(id++)); - Table.SetCell("Key", sKey); + Table.SetCell(t_s("Id", "list"), CString(id++)); + Table.SetCell(t_s("Key", "list"), sKey); } if (PutModule(Table) == 0) { // This double check is necessary, because the // set could be empty. - PutModule("No keys set for your user"); + PutModule(t_s("No keys set for your user")); } } @@ -197,12 +195,12 @@ class CSSLClientCertMod : public CModule { MSCString::iterator it = m_PubKeys.find(GetUser()->GetUserName()); if (it == m_PubKeys.end()) { - PutModule("No keys set for your user"); + PutModule(t_s("No keys set for your user")); return; } if (id == 0 || id > it->second.size()) { - PutModule("Invalid #, check \"list\""); + PutModule(t_s("Invalid #, check \"list\"")); return; } @@ -214,7 +212,7 @@ class CSSLClientCertMod : public CModule { it->second.erase(it2); if (it->second.size() == 0) m_PubKeys.erase(it); - PutModule("Removed"); + PutModule(t_s("Removed")); Save(); } @@ -287,5 +285,6 @@ void TModInfo(CModInfo& Info) { Info.SetWikiPage("certauth"); } -GLOBALMODULEDEFS(CSSLClientCertMod, - "Allow users to authenticate via SSL client certificates.") +GLOBALMODULEDEFS( + CSSLClientCertMod, + t_s("Allows users to authenticate via SSL client certificates.")) diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp index 5ffd1127..e7f9e829 100644 --- a/modules/chansaver.cpp +++ b/modules/chansaver.cpp @@ -87,4 +87,5 @@ void TModInfo(CModInfo& Info) { Info.AddType(CModInfo::GlobalModule); } -USERMODULEDEFS(CChanSaverMod, "Keep config up-to-date when user joins/parts.") +USERMODULEDEFS(CChanSaverMod, + t_s("Keeps config up-to-date when user joins/parts.")) diff --git a/modules/clearbufferonmsg.cpp b/modules/clearbufferonmsg.cpp index 7cc66426..839dc21a 100644 --- a/modules/clearbufferonmsg.cpp +++ b/modules/clearbufferonmsg.cpp @@ -157,6 +157,5 @@ void TModInfo(CModInfo& Info) { Info.SetArgsHelpText("[ [!] ]"); } -USERMODULEDEFS( - CClearBufferOnMsgMod, - "Clear all channel and query buffers whenever the user does something") +USERMODULEDEFS(CClearBufferOnMsgMod, t_s("Clears all channel and query buffers " + "whenever the user does something")) diff --git a/modules/controlpanel.cpp b/modules/controlpanel.cpp index e26be904..77f9b7a8 100644 --- a/modules/controlpanel.cpp +++ b/modules/controlpanel.cpp @@ -1500,73 +1500,63 @@ class CAdminMod : public CModule { public: MODCONSTRUCTOR(CAdminMod) { - AddCommand("Help", - static_cast(&CAdminMod::PrintHelp), - "[command] [variable]", - "Prints help for matching commands and variables"); - AddCommand("Get", static_cast(&CAdminMod::Get), - " [username]", - "Prints the variable's value for the given or current user"); - AddCommand("Set", static_cast(&CAdminMod::Set), - " ", - "Sets the variable's value for the given user"); - AddCommand("GetNetwork", - static_cast(&CAdminMod::GetNetwork), - " [username] [network]", - "Prints the variable's value for the given network"); - AddCommand("SetNetwork", - static_cast(&CAdminMod::SetNetwork), - " ", - "Sets the variable's value for the given network"); - AddCommand("GetChan", - static_cast(&CAdminMod::GetChan), - " [username] ", - "Prints the variable's value for the given channel"); + AddCommand("Help", t_d("[command] [variable]"), + t_d("Prints help for matching commands and variables"), + [=](const CString& sLine) { PrintHelp(sLine); }); + AddCommand( + "Get", t_d(" [username]"), + t_d("Prints the variable's value for the given or current user"), + [=](const CString& sLine) { Get(sLine); }); + AddCommand("Set", t_d(" "), + t_d("Sets the variable's value for the given user"), + [=](const CString& sLine) { Set(sLine); }); + AddCommand("GetNetwork", t_d(" [username] [network]"), + t_d("Prints the variable's value for the given network"), + [=](const CString& sLine) { GetNetwork(sLine); }); + AddCommand("SetNetwork", t_d(" "), + t_d("Sets the variable's value for the given network"), + [=](const CString& sLine) { SetNetwork(sLine); }); + AddCommand("GetChan", t_d(" [username] "), + t_d("Prints the variable's value for the given channel"), + [=](const CString& sLine) { GetChan(sLine); }); AddCommand("SetChan", - static_cast(&CAdminMod::SetChan), - " ", - "Sets the variable's value for the given channel"); - AddCommand("AddChan", - static_cast(&CAdminMod::AddChan), - " ", "Adds a new channel"); - AddCommand("DelChan", - static_cast(&CAdminMod::DelChan), - " ", "Deletes a channel"); - AddCommand("ListUsers", - static_cast(&CAdminMod::ListUsers), - "", "Lists users"); - AddCommand("AddUser", - static_cast(&CAdminMod::AddUser), - " ", "Adds a new user"); - AddCommand("DelUser", - static_cast(&CAdminMod::DelUser), - "", "Deletes a user"); - AddCommand("CloneUser", - static_cast(&CAdminMod::CloneUser), - " ", "Clones a user"); - AddCommand("AddServer", - static_cast(&CAdminMod::AddServer), - " ", - "Adds a new IRC server for the given or current user"); - AddCommand("DelServer", - static_cast(&CAdminMod::DelServer), - " ", - "Deletes an IRC server from the given or current user"); - AddCommand( - "Reconnect", - static_cast(&CAdminMod::ReconnectUser), - " ", "Cycles the user's IRC server connection"); - AddCommand("Disconnect", static_cast( - &CAdminMod::DisconnectUser), - " ", - "Disconnects the user from their IRC server"); - AddCommand( - "LoadModule", - static_cast(&CAdminMod::LoadModuleForUser), - " [args]", "Loads a Module for a user"); - AddCommand("UnLoadModule", static_cast( - &CAdminMod::UnLoadModuleForUser), - " ", "Removes a Module of a user"); + t_d(" "), + t_d("Sets the variable's value for the given channel"), + [=](const CString& sLine) { SetChan(sLine); }); + AddCommand("AddChan", t_d(" "), + t_d("Adds a new channel"), + [=](const CString& sLine) { AddChan(sLine); }); + AddCommand("DelChan", t_d(" "), + t_d("Deletes a channel"), + [=](const CString& sLine) { DelChan(sLine); }); + AddCommand("ListUsers", "", t_d("Lists users"), + [=](const CString& sLine) { ListUsers(sLine); }); + AddCommand("AddUser", t_d(" "), + t_d("Adds a new user"), + [=](const CString& sLine) { AddUser(sLine); }); + AddCommand("DelUser", t_d(""), t_d("Deletes a user"), + [=](const CString& sLine) { DelUser(sLine); }); + AddCommand("CloneUser", t_d(" "), + t_d("Clones a user"), + [=](const CString& sLine) { CloneUser(sLine); }); + AddCommand("AddServer", t_d(" "), + t_d("Adds a new IRC server for the given or current user"), + [=](const CString& sLine) { AddServer(sLine); }); + AddCommand("DelServer", t_d(" "), + t_d("Deletes an IRC server from the given or current user"), + [=](const CString& sLine) { DelServer(sLine); }); + AddCommand("Reconnect", t_d(" "), + t_d("Cycles the user's IRC server connection"), + [=](const CString& sLine) { ReconnectUser(sLine); }); + AddCommand("Disconnect", t_d(" "), + t_d("Disconnects the user from their IRC server"), + [=](const CString& sLine) { DisconnectUser(sLine); }); + AddCommand("LoadModule", t_d(" [args]"), + t_d("Loads a Module for a user"), + [=](const CString& sLine) { LoadModuleForUser(sLine); }); + AddCommand("UnLoadModule", t_d(" "), + t_d("Removes a Module of a user"), + [=](const CString& sLine) { UnLoadModuleForUser(sLine); }); AddCommand("ListMods", static_cast( &CAdminMod::ListModulesForUser), "", "Get the list of modules for a user"); @@ -1613,5 +1603,5 @@ void TModInfo(CModInfo& Info) { } USERMODULEDEFS(CAdminMod, - "Dynamic configuration through IRC. Allows editing only " - "yourself if you're not ZNC admin.") + t_s("Dynamic configuration through IRC. Allows editing only " + "yourself if you're not ZNC admin.")) diff --git a/modules/data/blockuser/tmpl/blockuser_WebadminUser.tmpl b/modules/data/blockuser/tmpl/blockuser_WebadminUser.tmpl index babea05f..9a67d441 100644 --- a/modules/data/blockuser/tmpl/blockuser_WebadminUser.tmpl +++ b/modules/data/blockuser/tmpl/blockuser_WebadminUser.tmpl @@ -1,3 +1,4 @@ +
diff --git a/modules/data/certauth/tmpl/index.tmpl b/modules/data/certauth/tmpl/index.tmpl index e98a1eed..3b0d69ab 100644 --- a/modules/data/certauth/tmpl/index.tmpl +++ b/modules/data/certauth/tmpl/index.tmpl @@ -1,17 +1,18 @@ +
-

Add A Note

+

-
Key:
+
- + " />
@@ -19,20 +20,20 @@ -

You have no keys.

+

- + - + diff --git a/modules/po/block_motd.pot b/modules/po/block_motd.pot index 1823bd73..ee679598 100644 --- a/modules/po/block_motd.pot +++ b/modules/po/block_motd.pot @@ -12,6 +12,10 @@ msgstr "" msgid "You are not connected to an IRC Server." msgstr "" +#: block_motd.cpp:60 +msgid "MOTD blocked by ZNC" +msgstr "" + #: block_motd.cpp:106 msgid "Block the MOTD from IRC so it's not sent to your client(s)." msgstr "" diff --git a/modules/po/blockuser.pot b/modules/po/blockuser.pot index edf5519f..6c262453 100644 --- a/modules/po/blockuser.pot +++ b/modules/po/blockuser.pot @@ -3,7 +3,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: modules/po/../data/blockuser/tmpl/blockuser_WebadminUser.tmpl:8 +#: modules/po/../data/blockuser/tmpl/blockuser_WebadminUser.tmpl:9 msgid "Account is blocked" msgstr "" diff --git a/modules/po/buffextras.pot b/modules/po/buffextras.pot new file mode 100644 index 00000000..7e34da64 --- /dev/null +++ b/modules/po/buffextras.pot @@ -0,0 +1,35 @@ +#: buffextras.cpp:45 +msgid "Server" +msgstr "" + +#: buffextras.cpp:47 +msgid "{1} set mode: {2} {3}" +msgstr "" + +#: buffextras.cpp:55 +msgid "{1} kicked {2} with reason: {3}" +msgstr "" + +#: buffextras.cpp:64 +msgid "{1} quit: {2}" +msgstr "" + +#: buffextras.cpp:73 +msgid "{1} joined" +msgstr "" + +#: buffextras.cpp:81 +msgid "{1} parted: {2}" +msgstr "" + +#: buffextras.cpp:90 +msgid "{1} is now known as {2}" +msgstr "" + +#: buffextras.cpp:100 +msgid "{1} changed the topic to: {2}" +msgstr "" + +#: buffextras.cpp:115 +msgid "Adds joins, parts etc. to the playback buffer" +msgstr "" diff --git a/modules/po/certauth.pot b/modules/po/certauth.pot new file mode 100644 index 00000000..eb356941 --- /dev/null +++ b/modules/po/certauth.pot @@ -0,0 +1,99 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: modules/po/../data/certauth/tmpl/index.tmpl:7 +msgid "Add a key" +msgstr "" + +#: modules/po/../data/certauth/tmpl/index.tmpl:11 +msgid "Key:" +msgstr "" + +#: modules/po/../data/certauth/tmpl/index.tmpl:15 +msgid "Add Key" +msgstr "" + +#: modules/po/../data/certauth/tmpl/index.tmpl:23 +msgid "You have no keys." +msgstr "" + +#: modules/po/../data/certauth/tmpl/index.tmpl:30 +msgctxt "web" +msgid "Key" +msgstr "" + +#: modules/po/../data/certauth/tmpl/index.tmpl:36 +msgid "del" +msgstr "" + +#: certauth.cpp:31 +msgid "[pubkey]" +msgstr "" + +#: certauth.cpp:32 +msgid "Add a public key. If key is not provided will use the current key" +msgstr "" + +#: certauth.cpp:35 +msgid "id" +msgstr "" + +#: certauth.cpp:35 +msgid "Delete a key by its number in List" +msgstr "" + +#: certauth.cpp:37 +msgid "List your public keys" +msgstr "" + +#: certauth.cpp:39 +msgid "Print your current key" +msgstr "" + +#: certauth.cpp:142 +msgid "You are not connected with any valid public key" +msgstr "" + +#: certauth.cpp:144 +msgid "Your current public key is: {1}" +msgstr "" + +#: certauth.cpp:157 +msgid "You did not supply a public key or connect with one." +msgstr "" + +#: certauth.cpp:160 +msgid "Key '{1}' added." +msgstr "" + +#: certauth.cpp:162 +msgid "The key '{1}' is already added." +msgstr "" + +#: certauth.cpp:170 certauth.cpp:182 +msgctxt "list" +msgid "Id" +msgstr "" + +#: certauth.cpp:171 certauth.cpp:183 +msgctxt "list" +msgid "Key" +msgstr "" + +#: certauth.cpp:175 certauth.cpp:189 certauth.cpp:198 +msgid "No keys set for your user" +msgstr "" + +#: certauth.cpp:203 +msgid "Invalid #, check \"list\"" +msgstr "" + +#: certauth.cpp:215 +msgid "Removed" +msgstr "" + +#: certauth.cpp:290 +msgid "Allows users to authenticate via SSL client certificates." +msgstr "" diff --git a/modules/po/chansaver.pot b/modules/po/chansaver.pot new file mode 100644 index 00000000..02f3c8cf --- /dev/null +++ b/modules/po/chansaver.pot @@ -0,0 +1,3 @@ +#: chansaver.cpp:91 +msgid "Keeps config up-to-date when user joins/parts." +msgstr "" diff --git a/modules/po/clearbufferonmsg.pot b/modules/po/clearbufferonmsg.pot new file mode 100644 index 00000000..ab5db0e1 --- /dev/null +++ b/modules/po/clearbufferonmsg.pot @@ -0,0 +1,3 @@ +#: clearbufferonmsg.cpp:160 +msgid "Clears all channel and query buffers whenever the user does something" +msgstr "" diff --git a/modules/po/disconkick.pot b/modules/po/disconkick.pot new file mode 100644 index 00000000..3542248c --- /dev/null +++ b/modules/po/disconkick.pot @@ -0,0 +1,9 @@ +#: disconkick.cpp:32 +msgid "You have been disconnected from the IRC server" +msgstr "" + +#: disconkick.cpp:45 +msgid "" +"Kicks the client from all channels when the connection to the IRC server is " +"lost" +msgstr "" diff --git a/modules/po/webadmin.pot b/modules/po/webadmin.pot index 574a973d..a53eb43d 100644 --- a/modules/po/webadmin.pot +++ b/modules/po/webadmin.pot @@ -947,7 +947,7 @@ msgstr "" msgid "Are you sure you want to delete user “{1}”?" msgstr "" -#: webadmin.cpp:91 webadmin.cpp:1860 +#: webadmin.cpp:91 webadmin.cpp:1866 msgid "Global Settings" msgstr "" @@ -955,11 +955,11 @@ msgstr "" msgid "Your Settings" msgstr "" -#: webadmin.cpp:94 webadmin.cpp:1672 +#: webadmin.cpp:94 webadmin.cpp:1678 msgid "Traffic Info" msgstr "" -#: webadmin.cpp:97 webadmin.cpp:1651 +#: webadmin.cpp:97 webadmin.cpp:1657 msgid "Manage Users" msgstr "" @@ -975,211 +975,211 @@ msgstr "" msgid "Timeout can't be less than 30 seconds!" msgstr "" -#: webadmin.cpp:391 webadmin.cpp:419 webadmin.cpp:1173 webadmin.cpp:2042 +#: webadmin.cpp:395 webadmin.cpp:423 webadmin.cpp:1177 webadmin.cpp:2048 msgid "Unable to load module [{1}]: {2}" msgstr "" -#: webadmin.cpp:396 webadmin.cpp:424 +#: webadmin.cpp:400 webadmin.cpp:428 msgid "Unable to load module [{1}] with arguments [{2}]" msgstr "" -#: webadmin.cpp:505 webadmin.cpp:609 webadmin.cpp:634 webadmin.cpp:656 -#: webadmin.cpp:690 webadmin.cpp:1240 +#: webadmin.cpp:509 webadmin.cpp:613 webadmin.cpp:638 webadmin.cpp:660 +#: webadmin.cpp:694 webadmin.cpp:1244 msgid "No such user" msgstr "" -#: webadmin.cpp:518 webadmin.cpp:550 webadmin.cpp:579 webadmin.cpp:595 +#: webadmin.cpp:522 webadmin.cpp:554 webadmin.cpp:583 webadmin.cpp:599 msgid "No such user or network" msgstr "" -#: webadmin.cpp:560 +#: webadmin.cpp:564 msgid "No such channel" msgstr "" -#: webadmin.cpp:626 +#: webadmin.cpp:630 msgid "Please don't delete yourself, suicide is not the answer!" msgstr "" -#: webadmin.cpp:699 webadmin.cpp:955 webadmin.cpp:1305 +#: webadmin.cpp:703 webadmin.cpp:959 webadmin.cpp:1309 msgid "Edit User [{1}]" msgstr "" -#: webadmin.cpp:703 webadmin.cpp:881 +#: webadmin.cpp:707 webadmin.cpp:885 msgid "Edit Network [{1}]" msgstr "" -#: webadmin.cpp:713 +#: webadmin.cpp:717 msgid "Edit Channel [{1}] of Network [{2}] of User [{3}]" msgstr "" -#: webadmin.cpp:720 +#: webadmin.cpp:724 msgid "Edit Channel [{1}]" msgstr "" -#: webadmin.cpp:728 +#: webadmin.cpp:732 msgid "Add Channel to Network [{1}] of User [{2}]" msgstr "" -#: webadmin.cpp:733 +#: webadmin.cpp:737 msgid "Add Channel" msgstr "" -#: webadmin.cpp:740 webadmin.cpp:1498 +#: webadmin.cpp:744 webadmin.cpp:1504 msgid "Auto Clear Chan Buffer" msgstr "" -#: webadmin.cpp:742 +#: webadmin.cpp:746 msgid "Automatically Clear Channel Buffer After Playback" msgstr "" -#: webadmin.cpp:750 +#: webadmin.cpp:754 msgid "Detached" msgstr "" -#: webadmin.cpp:757 +#: webadmin.cpp:761 msgid "Enabled" msgstr "" -#: webadmin.cpp:781 +#: webadmin.cpp:785 msgid "Channel name is a required argument" msgstr "" -#: webadmin.cpp:790 +#: webadmin.cpp:794 msgid "Channel [{1}] already exists" msgstr "" -#: webadmin.cpp:797 +#: webadmin.cpp:801 msgid "Could not add channel [{1}]" msgstr "" -#: webadmin.cpp:845 +#: webadmin.cpp:849 msgid "Channel was added/modified, but config file was not written" msgstr "" -#: webadmin.cpp:878 +#: webadmin.cpp:882 msgid "Edit Network [{1}] of User [{2}]" msgstr "" -#: webadmin.cpp:885 webadmin.cpp:1062 +#: webadmin.cpp:889 webadmin.cpp:1066 msgid "" "Network number limit reached. Ask an admin to increase the limit for you, or " "delete unneeded networks from Your Settings." msgstr "" -#: webadmin.cpp:893 +#: webadmin.cpp:897 msgid "Add Network for User [{1}]" msgstr "" -#: webadmin.cpp:894 +#: webadmin.cpp:898 msgid "Add Network" msgstr "" -#: webadmin.cpp:1056 +#: webadmin.cpp:1060 msgid "Network name is a required argument" msgstr "" -#: webadmin.cpp:1180 webadmin.cpp:2049 +#: webadmin.cpp:1184 webadmin.cpp:2055 msgid "Unable to reload module [{1}]: {2}" msgstr "" -#: webadmin.cpp:1217 +#: webadmin.cpp:1221 msgid "Network was added/modified, but config file was not written" msgstr "" -#: webadmin.cpp:1246 +#: webadmin.cpp:1250 msgid "That network doesn't exist for this user" msgstr "" -#: webadmin.cpp:1263 +#: webadmin.cpp:1267 msgid "Network was deleted, but config file was not written" msgstr "" -#: webadmin.cpp:1277 +#: webadmin.cpp:1281 msgid "That channel doesn't exist for this network" msgstr "" -#: webadmin.cpp:1286 +#: webadmin.cpp:1290 msgid "Channel was deleted, but config file was not written" msgstr "" -#: webadmin.cpp:1314 +#: webadmin.cpp:1318 msgid "Clone User [{1}]" msgstr "" -#: webadmin.cpp:1500 +#: webadmin.cpp:1506 msgid "" "Automatically Clear Channel Buffer After Playback (the default value for new " "channels)" msgstr "" -#: webadmin.cpp:1510 +#: webadmin.cpp:1516 msgid "Multi Clients" msgstr "" -#: webadmin.cpp:1517 +#: webadmin.cpp:1523 msgid "Append Timestamps" msgstr "" -#: webadmin.cpp:1524 +#: webadmin.cpp:1530 msgid "Prepend Timestamps" msgstr "" -#: webadmin.cpp:1532 +#: webadmin.cpp:1538 msgid "Deny LoadMod" msgstr "" -#: webadmin.cpp:1539 +#: webadmin.cpp:1545 msgid "Admin" msgstr "" -#: webadmin.cpp:1549 +#: webadmin.cpp:1555 msgid "Deny SetBindHost" msgstr "" -#: webadmin.cpp:1557 +#: webadmin.cpp:1563 msgid "Auto Clear Query Buffer" msgstr "" -#: webadmin.cpp:1559 +#: webadmin.cpp:1565 msgid "Automatically Clear Query Buffer After Playback" msgstr "" -#: webadmin.cpp:1583 +#: webadmin.cpp:1589 msgid "Invalid Submission: User {1} already exists" msgstr "" -#: webadmin.cpp:1605 webadmin.cpp:1616 +#: webadmin.cpp:1611 webadmin.cpp:1622 msgid "Invalid submission: {1}" msgstr "" -#: webadmin.cpp:1611 +#: webadmin.cpp:1617 msgid "User was added, but config file was not written" msgstr "" -#: webadmin.cpp:1622 +#: webadmin.cpp:1628 msgid "User was edited, but config file was not written" msgstr "" -#: webadmin.cpp:1780 +#: webadmin.cpp:1786 msgid "Choose either IPv4 or IPv6 or both." msgstr "" -#: webadmin.cpp:1797 +#: webadmin.cpp:1803 msgid "Choose either IRC or HTTP or both." msgstr "" -#: webadmin.cpp:1810 webadmin.cpp:1846 +#: webadmin.cpp:1816 webadmin.cpp:1852 msgid "Port was changed, but config file was not written" msgstr "" -#: webadmin.cpp:1836 +#: webadmin.cpp:1842 msgid "Invalid request." msgstr "" -#: webadmin.cpp:1850 +#: webadmin.cpp:1856 msgid "The specified listener was not found." msgstr "" -#: webadmin.cpp:2078 +#: webadmin.cpp:2084 msgid "Settings were changed, but config file was not written" msgstr "" diff --git a/modules/po/webadmin.ru.po b/modules/po/webadmin.ru.po index 7c651c4a..68f4d000 100644 --- a/modules/po/webadmin.ru.po +++ b/modules/po/webadmin.ru.po @@ -1011,7 +1011,7 @@ msgstr "Подтверждение удаления пользователя" msgid "Are you sure you want to delete user “{1}”?" msgstr "Вы действительно хотите удалить пользователя «{1}»?" -#: webadmin.cpp:91 webadmin.cpp:1860 +#: webadmin.cpp:91 webadmin.cpp:1866 msgid "Global Settings" msgstr "Глобальные настройки" @@ -1019,11 +1019,11 @@ msgstr "Глобальные настройки" msgid "Your Settings" msgstr "Мои настройки" -#: webadmin.cpp:94 webadmin.cpp:1672 +#: webadmin.cpp:94 webadmin.cpp:1678 msgid "Traffic Info" msgstr "Трафик" -#: webadmin.cpp:97 webadmin.cpp:1651 +#: webadmin.cpp:97 webadmin.cpp:1657 msgid "Manage Users" msgstr "Пользователи" @@ -1039,92 +1039,92 @@ msgstr "Ошибка: пароли не совпадают" msgid "Timeout can't be less than 30 seconds!" msgstr "" -#: webadmin.cpp:391 webadmin.cpp:419 webadmin.cpp:1173 webadmin.cpp:2042 +#: webadmin.cpp:395 webadmin.cpp:423 webadmin.cpp:1177 webadmin.cpp:2048 msgid "Unable to load module [{1}]: {2}" msgstr "Не могу загрузить модуль [{1}]: {2}" -#: webadmin.cpp:396 webadmin.cpp:424 +#: webadmin.cpp:400 webadmin.cpp:428 msgid "Unable to load module [{1}] with arguments [{2}]" msgstr "Не могу загрузить модуль [{1}] с аргументами [{2}]" -#: webadmin.cpp:505 webadmin.cpp:609 webadmin.cpp:634 webadmin.cpp:656 -#: webadmin.cpp:690 webadmin.cpp:1240 +#: webadmin.cpp:509 webadmin.cpp:613 webadmin.cpp:638 webadmin.cpp:660 +#: webadmin.cpp:694 webadmin.cpp:1244 msgid "No such user" msgstr "Нет такого пользователя" -#: webadmin.cpp:518 webadmin.cpp:550 webadmin.cpp:579 webadmin.cpp:595 +#: webadmin.cpp:522 webadmin.cpp:554 webadmin.cpp:583 webadmin.cpp:599 msgid "No such user or network" msgstr "Нет такого пользователя" -#: webadmin.cpp:560 +#: webadmin.cpp:564 msgid "No such channel" msgstr "Нет такого канала" -#: webadmin.cpp:626 +#: webadmin.cpp:630 msgid "Please don't delete yourself, suicide is not the answer!" msgstr "Пожалуйста, не удаляйте себя, самоубийство — не ответ!" -#: webadmin.cpp:699 webadmin.cpp:955 webadmin.cpp:1305 +#: webadmin.cpp:703 webadmin.cpp:959 webadmin.cpp:1309 msgid "Edit User [{1}]" msgstr "Пользователь [{1}]" -#: webadmin.cpp:703 webadmin.cpp:881 +#: webadmin.cpp:707 webadmin.cpp:885 msgid "Edit Network [{1}]" msgstr "Сеть [{1}]" -#: webadmin.cpp:713 +#: webadmin.cpp:717 msgid "Edit Channel [{1}] of Network [{2}] of User [{3}]" msgstr "Канал [{1}] в сети [{2}] пользователя [{3}]" -#: webadmin.cpp:720 +#: webadmin.cpp:724 msgid "Edit Channel [{1}]" msgstr "Канал [{1}]" -#: webadmin.cpp:728 +#: webadmin.cpp:732 msgid "Add Channel to Network [{1}] of User [{2}]" msgstr "Новый канал для сети [{1}] пользователя [{2}]" -#: webadmin.cpp:733 +#: webadmin.cpp:737 msgid "Add Channel" msgstr "Новый канал" -#: webadmin.cpp:740 webadmin.cpp:1498 +#: webadmin.cpp:744 webadmin.cpp:1504 msgid "Auto Clear Chan Buffer" msgstr "Автоматически очищать буфер канала" -#: webadmin.cpp:742 +#: webadmin.cpp:746 msgid "Automatically Clear Channel Buffer After Playback" msgstr "Автоматически очищать буфер канала после воспроизведения" -#: webadmin.cpp:750 +#: webadmin.cpp:754 msgid "Detached" msgstr "Отделён" -#: webadmin.cpp:757 +#: webadmin.cpp:761 msgid "Enabled" msgstr "Включена" -#: webadmin.cpp:781 +#: webadmin.cpp:785 msgid "Channel name is a required argument" msgstr "Необходимо имя канала" -#: webadmin.cpp:790 +#: webadmin.cpp:794 msgid "Channel [{1}] already exists" msgstr "Канал [{1}] уже существует" -#: webadmin.cpp:797 +#: webadmin.cpp:801 msgid "Could not add channel [{1}]" msgstr "Не могу добавить канал [{1}]" -#: webadmin.cpp:845 +#: webadmin.cpp:849 msgid "Channel was added/modified, but config file was not written" msgstr "Канал добавлен/изменён, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:878 +#: webadmin.cpp:882 msgid "Edit Network [{1}] of User [{2}]" msgstr "Сеть [{1}] пользователя [{2}]" -#: webadmin.cpp:885 webadmin.cpp:1062 +#: webadmin.cpp:889 webadmin.cpp:1066 msgid "" "Network number limit reached. Ask an admin to increase the limit for you, or " "delete unneeded networks from Your Settings." @@ -1132,47 +1132,47 @@ msgstr "" "Достигнуто ограничение на количество сетей. Попросите администратора поднять " "вам лимит или удалите ненужные сети в «Моих настройках»" -#: webadmin.cpp:893 +#: webadmin.cpp:897 msgid "Add Network for User [{1}]" msgstr "Новая сеть пользователя [{1}]" -#: webadmin.cpp:894 +#: webadmin.cpp:898 msgid "Add Network" msgstr "Новая сеть" -#: webadmin.cpp:1056 +#: webadmin.cpp:1060 msgid "Network name is a required argument" msgstr "Необходимо имя сети" -#: webadmin.cpp:1180 webadmin.cpp:2049 +#: webadmin.cpp:1184 webadmin.cpp:2055 msgid "Unable to reload module [{1}]: {2}" msgstr "Не могу перегрузить модуль [{1}]: {2}" -#: webadmin.cpp:1217 +#: webadmin.cpp:1221 msgid "Network was added/modified, but config file was not written" msgstr "Сеть добавлена/изменена, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:1246 +#: webadmin.cpp:1250 msgid "That network doesn't exist for this user" msgstr "У этого пользователя нет такой сети" -#: webadmin.cpp:1263 +#: webadmin.cpp:1267 msgid "Network was deleted, but config file was not written" msgstr "Сеть удалена, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:1277 +#: webadmin.cpp:1281 msgid "That channel doesn't exist for this network" msgstr "В этой сети нет такого канала" -#: webadmin.cpp:1286 +#: webadmin.cpp:1290 msgid "Channel was deleted, but config file was not written" msgstr "Канал удалён, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:1314 +#: webadmin.cpp:1318 msgid "Clone User [{1}]" msgstr "Клон пользователя [{1}]" -#: webadmin.cpp:1500 +#: webadmin.cpp:1506 msgid "" "Automatically Clear Channel Buffer After Playback (the default value for new " "channels)" @@ -1180,74 +1180,74 @@ msgstr "" "Автоматически очищать буфер канала после воспроизведения (значение по " "умолчанию для новых каналов)" -#: webadmin.cpp:1510 +#: webadmin.cpp:1516 msgid "Multi Clients" msgstr "Много клиентов" -#: webadmin.cpp:1517 +#: webadmin.cpp:1523 msgid "Append Timestamps" msgstr "Метка времени в конце" -#: webadmin.cpp:1524 +#: webadmin.cpp:1530 msgid "Prepend Timestamps" msgstr "Метка времени в начале" -#: webadmin.cpp:1532 +#: webadmin.cpp:1538 msgid "Deny LoadMod" msgstr "Запрет загрузки модулей" -#: webadmin.cpp:1539 +#: webadmin.cpp:1545 msgid "Admin" msgstr "Администратор" -#: webadmin.cpp:1549 +#: webadmin.cpp:1555 msgid "Deny SetBindHost" msgstr "Запрет смены хоста" -#: webadmin.cpp:1557 +#: webadmin.cpp:1563 msgid "Auto Clear Query Buffer" msgstr "Автоматически очищать буфер личных сообщений" -#: webadmin.cpp:1559 +#: webadmin.cpp:1565 msgid "Automatically Clear Query Buffer After Playback" msgstr "Автоматически очищать буфер личных сообщений после воспроизведения" -#: webadmin.cpp:1583 +#: webadmin.cpp:1589 msgid "Invalid Submission: User {1} already exists" msgstr "Ошибка: пользователь {1} уже существует" -#: webadmin.cpp:1605 webadmin.cpp:1616 +#: webadmin.cpp:1611 webadmin.cpp:1622 msgid "Invalid submission: {1}" msgstr "Ошибка: {1}" -#: webadmin.cpp:1611 +#: webadmin.cpp:1617 msgid "User was added, but config file was not written" msgstr "Пользователь добавлен, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:1622 +#: webadmin.cpp:1628 msgid "User was edited, but config file was not written" msgstr "Пользователь изменён, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:1780 +#: webadmin.cpp:1786 msgid "Choose either IPv4 or IPv6 or both." msgstr "Выберите IPv4, IPv6 или и то, и другое." -#: webadmin.cpp:1797 +#: webadmin.cpp:1803 msgid "Choose either IRC or HTTP or both." msgstr "Выберите IRC, HTTP или и то, и другое." -#: webadmin.cpp:1810 webadmin.cpp:1846 +#: webadmin.cpp:1816 webadmin.cpp:1852 msgid "Port was changed, but config file was not written" msgstr "Порт изменён, но записать конфигурацию в файл не удалось" -#: webadmin.cpp:1836 +#: webadmin.cpp:1842 msgid "Invalid request." msgstr "Некорректный запрос." -#: webadmin.cpp:1850 +#: webadmin.cpp:1856 msgid "The specified listener was not found." msgstr "Указанный порт не найден." -#: webadmin.cpp:2078 +#: webadmin.cpp:2084 msgid "Settings were changed, but config file was not written" msgstr "Настройки изменены, но записать конфигурацию в файл не удалось"
Key
[del][]