Merge branch '2.0' into 2.1.

data/modules.example.conf

@@ -65,7 +65,7 @@ module { name = "help" }
 	/* This should be the names of the public facing nameservers serving the records. */
 	nameservers = "ns1.example.com ns2.example.com"
 
-	/* The time slave servers are allowed to cache. This should be reasonably low
+	/* The time secondary servers are allowed to cache for. This should be reasonably low
 	 * if you want your records to be updated without much delay.
 	 */
 	refresh = 3600
@@ -704,7 +704,7 @@ module
  * sql_log
  *
  * This module adds an additional target option to log{} blocks
- * that allows logging Service's logs to SQL. To log to SQL, add
+ * that allows logging Services' logs to SQL. To log to SQL, add
  * the SQL service name to log:targets prefixed by sql_log:. For
  * example:
  *

data/operserv.example.conf

@@ -287,15 +287,15 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
  * To use this module you must set a nameserver record for services
  * so that DNS queries go to services.
  *
- * Alternatively, you may use a slave DNS server to hide service's IP,
+ * Alternatively, you may use a secondary DNS server to hide services' IP,
  * provide query caching, and provide better fault tolerance.
  *
  * To do this using BIND, configure similar to:
  *
  * options { max-refresh-time 60; };
  * zone "irc.example.com" IN {
- *   type slave;
- *   masters { 127.0.0.1 port 5353; };
+ *   type secondary;
+ *   primaries { 127.0.0.1 port 5353; };
  * };
  *
  * Where 127.0.0.1:5353 is the IP and port services are listening on.

language/anope.de_DE.po

@@ -6607,7 +6607,7 @@ msgid "Service"
 msgstr "Server gefunden: %d"
 
 #, fuzzy, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "Die Services haben den Nicknamen wieder verfügbar gemacht."
 
 #, fuzzy

language/anope.el_GR.po

@@ -6832,7 +6832,7 @@ msgid "Service"
 msgstr "Τα services είναι ενεργά για %s"
 
 #, fuzzy, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "Οι υπηρεσίες απελευθέρωααν το ψευδώνυμό σου."
 
 #, fuzzy

language/anope.en_US.po

@@ -4535,10 +4535,6 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#, c-format
-msgid "Service's hold on %s has been released."
-msgstr ""
-
 msgid "Services Operator commands"
 msgstr ""
 
@@ -4620,6 +4616,10 @@ msgstr ""
 msgid "Services' configuration has been reloaded."
 msgstr ""
 
+#, c-format
+msgid "Services' hold on %s has been released."
+msgstr ""
+
 msgid "Session"
 msgstr ""
 

language/anope.es_ES.po

@@ -6273,7 +6273,7 @@ msgid "Service"
 msgstr "Servicio"
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "El nick %s retenido por los servicios ha sido liberado."
 
 #, fuzzy

language/anope.fr_FR.po

@@ -6155,7 +6155,7 @@ msgid "Service"
 msgstr "Service"
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "La tutelle des Services sur %s a été enlevée."
 
 msgid "Services Operator commands"

language/anope.it_IT.po

@@ -6146,7 +6146,7 @@ msgid "Service"
 msgstr "Servizio"
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "Il blocco dei servizi sul nick %s è stato rilasciato."
 
 msgid "Services Operator commands"

language/anope.nl_NL.po

@@ -6182,7 +6182,7 @@ msgid "Service"
 msgstr "Service"
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "Nick %s werd vrijgegeven."
 
 msgid "Services Operator commands"

language/anope.pl_PL.po

@@ -6123,7 +6123,7 @@ msgid "Service"
 msgstr "Usługa"
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "Serwisy właśnie zwolniły nicka %s."
 
 msgid "Services Operator commands"

language/anope.pt_PT.po

@@ -5675,7 +5675,7 @@ msgid "Service"
 msgstr ""
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr ""
 
 msgid "Services Operator commands"

language/anope.tr_TR.po

@@ -6067,7 +6067,7 @@ msgid "Service"
 msgstr "Servis"
 
 #, c-format
-msgid "Service's hold on %s has been released."
+msgid "Services' hold on %s has been released."
 msgstr "Servisin %s üzerindeki bekletmesi kaldırıldı."
 
 msgid "Services Operator commands"

modules/dns.cpp

@@ -638,7 +638,7 @@ public:
 		if (!packet)
 			return false;
 
-		Log(LOG_DEBUG_2) << "Resolver: Notifying slave " << packet->addr.addr();
+		Log(LOG_DEBUG_2) << "Resolver: Notifying secondary " << packet->addr.addr();
 
 		try
 		{
@@ -939,7 +939,7 @@ public:
 
 	void Notify(const Anope::string &zone) override
 	{
-		/* notify slaves of the update */
+		/* notify secondaries of the update */
 		for (const auto &[ip, port] : notify)
 		{
 			sockaddrs addr;

modules/nickserv/ns_recover.cpp

@@ -55,7 +55,7 @@ public:
 		if (na->HasExt("HELD"))
 		{
 			nickserv->Release(na);
-			source.Reply(_("Service's hold on \002%s\002 has been released."), na->nick.c_str());
+			source.Reply(_("Services' hold on \002%s\002 has been released."), na->nick.c_str());
 		}
 		else if (!u)
 		{