[trac744] Change to the third person

src/lib/datasrc/data_source.cc

@@ -222,7 +222,8 @@ checkCache(QueryTask& task, RRsetList& target) {
         // ANY queries must be handled by the low-level data source,
         // or the results won't be guaranteed to be complete
         if (task.qtype == RRType::ANY() || task.qclass == RRClass::ANY()) {
-            logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_NO_CACHE_ANY_SIMPLE);
+            logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_NO_CACHE_ANY_SIMPLE).
+                arg(task.qname).arg(task.qtype).arg(task.qclass);
             break;
         }
 
@@ -252,7 +253,8 @@ checkCache(QueryTask& task, RRsetList& target) {
 
     case QueryTask::AUTH_QUERY:         // Find exact RRset or CNAME
         if (task.qtype == RRType::ANY() || task.qclass == RRClass::ANY()) {
-            logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_NO_CACHE_ANY_AUTH);
+            logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_NO_CACHE_ANY_AUTH).
+                arg(task.qname).arg(task.qtype).arg(task.qclass);
             break;
         }
 
@@ -389,7 +391,8 @@ doQueryTask(QueryTask& task, ZoneInfo& zoneinfo, RRsetList& target) {
 
     // Then check the cache for matching data
     if (checkCache(task, target)) {
-        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_CACHED);
+        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_CACHED).arg(task.qname).
+            arg(task.qtype);
         return (DataSrc::SUCCESS);
     }
 
@@ -400,7 +403,8 @@ doQueryTask(QueryTask& task, ZoneInfo& zoneinfo, RRsetList& target) {
     DataSrc::Result result;
     switch (task.op) {
     case QueryTask::SIMPLE_QUERY:
-        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_IS_SIMPLE);
+        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_IS_SIMPLE).arg(task.qname).
+            arg(task.qtype);
         result = ds->findExactRRset(task.qname, task.qclass, task.qtype,
                                     target, task.flags, zonename);
 
@@ -427,7 +431,8 @@ doQueryTask(QueryTask& task, ZoneInfo& zoneinfo, RRsetList& target) {
         return (result);
 
     case QueryTask::AUTH_QUERY:
-        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_IS_AUTH);
+        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_IS_AUTH).arg(task.qname).
+            arg(task.qtype);
         result = ds->findRRset(task.qname, task.qclass, task.qtype,
                                target, task.flags, zonename);
 
@@ -466,7 +471,8 @@ doQueryTask(QueryTask& task, ZoneInfo& zoneinfo, RRsetList& target) {
     case QueryTask::GLUE_QUERY:
     case QueryTask::NOGLUE_QUERY:
         logger.debug(DBG_TRACE_DATA, task.op == QueryTask::GLUE_QUERY ?
-                     DATASRC_QUERY_IS_GLUE : DATASRC_QUERY_IS_NOGLUE);
+                     DATASRC_QUERY_IS_GLUE : DATASRC_QUERY_IS_NOGLUE).
+            arg(task.qname).arg(task.qtype);
         result = ds->findAddrs(task.qname, task.qclass, target,
                                task.flags, zonename);
 
@@ -499,7 +505,8 @@ doQueryTask(QueryTask& task, ZoneInfo& zoneinfo, RRsetList& target) {
         return (result);
 
     case QueryTask::REF_QUERY:
-        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_IS_REF);
+        logger.debug(DBG_TRACE_DATA, DATASRC_QUERY_IS_REF).arg(task.qname).
+            arg(task.qtype);
         result = ds->findReferral(task.qname, task.qclass, target,
                                  task.flags, zonename);
 

src/lib/datasrc/messagedef.mes

@@ -40,26 +40,23 @@ be dropped. This should be directly followed by CACHE_REMOVE.
 % CACHE_REMOVE removing '%1' from the cache
 Debug information. An item is being removed from the hotspot cache.
 
-% CACHE_LOOKUP looking up '%1' in the cache
-Debug information. We are trying to look up an item in the hotspot cache.
-Further progress and result will follow.
-
 % CACHE_NOT_FOUND the item '%1' was not found
-Debug information. We tried to look up an item in the hotspot cache, but
-it is not there.
+Debug information. It was attempted to look up an item in the hotspot cache,
+but it is not there.
 
 % CACHE_FOUND the item '%1' was found
-Debug information. We successfully looked up an item in the hotspot cache.
+Debug information. An item was successfully looked up in the hotspot cache.
 
 % CACHE_EXPIRED the item '%1' is expired
-Debug information. We tried to find an item in the hotspot cache and in fact
-we did, but it was too old. So we pretend we didn't find it at all (the
-external effect is the same as CACHE_NOT_FOUND).
+Debug information. There was an attempt to look up an item in the hotspot
+cache. And the item was actually there, but it was too old, so it was removed
+instead and nothing is reported (the external behaviour is the same as with
+CACHE_NOT_FOUND).
 
 % CACHE_SLOTS setting the cache size to '%1', dropping '%2' items
 The maximum allowed number of items of the hotspot cache is set to the given
-number. If there are too many, we're going to drop them right now. The size
-of 0 means no limit.
+number. If there are too many, some of them will be dropped. The size of 0
+means no limit.
 
 % CACHE_ENABLE enabling the cache
 The hotspot cache is enabled from now on.
@@ -69,188 +66,191 @@ The hotspot cache is disabled from now on. It is not going to store
 information or return anything.
 
 % QUERY_SYNTH_CNAME synthesizing CNAME from DNAME on '%1'
-Debug information. While answering a query, we met a DNAME. We'll return the
-DNAME, but we're creating a CNAME for clients that don't understand DNAMEs.
+Debug information. While answering a query, a DNAME was met. The DNAME itself
+will be returned, but along with it a CNAME for clients which don't understand
+DNAMEs will be synthesized.
 
 % QUERY_EMPTY_DNAME the DNAME on '%1' is empty
-We tried to synthesize a CNAME from this DNAME, but it contains no records.
-This indicates problem with supplied data.
+During an attempt to synthesize CNAME from this DNAME it was discovered the
+DNAME is empty (it has no records). This indicates problem with supplied data.
 
 % QUERY_GET_NS_ADDITIONAL addition of A/AAAA for '%1' requested by NS '%2'
-Debug information. While processing a query, we met a NS record. It
-references the mentioned address, so we want to look up A/AAAA records for it
+Debug information. While processing a query, a NS record was met. It
+references the mentioned address, so A/AAAA records for it are looked up
 and put it into the additional section.
 
 % QUERY_GET_MX_ADDITIONAL addition of A/AAAA for '%1' requested by MX '%2'
-Debug information. While processing a query, we met a MX record. It
-references the mentioned address, so we want to look up A/AAAA records for it
+Debug information. While processing a query, a MX record was met. It
+references the mentioned address, so A/AAAA records for it are looked up
 and put it into the additional section.
 
 % QUERY_FOLLOW_CNAME following CNAME at '%1'
 Debug information. The domain is a CNAME (or a DNAME and we created a CNAME
-for it already), so we're following it.
+for it already), so it's being followed.
 
 % QUERY_EMPTY_CNAME cNAME at '%1' is empty
-We tried to follow a CNAME, but contains no records. We have nothing to
-follow, so we will have nothing in the answer. This indicates a problem with
-supplied data.
+There was an CNAME and it was being followed. But it contains no records,
+so there's nowhere to go. There will be no answer. This indicates a problem
+with supplied data.
+We tried to follow
 
 % QUERY_TOO_MANY_CNAMES cNAME chain limit exceeded at '%1'
-While answering a query, we followed a CNAME. Then another one. And after 16
-CNAMEs we decided it's enough and we won't follow more. Long CNAME chains
-are discouraged, and this might be a loop as well. Note that some of the
-CNAMEs might have been synthesised from DNAMEs internally. This indicates
-a problem with supplied data.
+A CNAME led to another CNAME and it led to another, and so on. After 16
+CNAMEs, the software gave up. Long CNAME chains are discouraged, and this
+might possibly be a loop as well. Note that some of the CNAMEs might have
+been synthesized from DNAMEs. This indicates problem with supplied data.
 
 % QUERY_CHECK_CACHE checking cache for '%1/%2'
-Debug information. While processing a query we're looking into the hotspot
-cache.
+Debug information. While processing a query, lookup to the hotspot cache
+is being made.
 
-% QUERY_NO_CACHE_ANY_SIMPLE ignoring cache for ANY query
-Debug information. We don't really want to use cache for simple ANY query
-(ANY as the type or class).
+% QUERY_NO_CACHE_ANY_SIMPLE ignoring cache for ANY query (%1/%2 in %3 class)
+Debug information. The hotspot cache is ignored for ANY queries for consistency
+reasons.
 
-% QUERY_NO_CACHE_ANY_AUTH ignoring cache for ANY query
-Debug information. We don't really want to use cache for authoritative ANY
-query (ANY as the type or class).
+% QUERY_NO_CACHE_ANY_AUTH ignoring cache for ANY query (%1/%2 in %3 class)
+Debug information. The hotspot cache is ignored for authoritative ANY queries
+for consistency reasons.
 
 % DO_QUERY handling query for '%1/%2'
 Debug information. We're processing some internal query for given name and
 type.
 
 % QUERY_NO_ZONE no zone containing '%1' in class '%2'
-We tried to get the domain but there's no zone in our data that encloses
-the name. Maybe someone sent a query to wrong server for some reason.
+Lookup of domain failed because the data have no zone that contain the
+domain. Maybe someone sent a query to the wrong server for some reason.
 
-% QUERY_CACHED data found in cache
-Debug information. We found the requested data in cache, so we're not
-querying the real data source.
+% QUERY_CACHED data for %1/%2 found in cache
+Debug information. The requested data were found in the hotspot cache, so
+no query is sent to the real data source.
 
-% QUERY_IS_SIMPLE simple query
+% QUERY_IS_SIMPLE simple query (%1/%2)
 Debug information. The last DO_QUERY is a simple query.
 
-% QUERY_IS_AUTH auth query
+% QUERY_IS_AUTH auth query (%1/%2)
 Debug information. The last DO_QUERY is an auth query.
 
-% QUERY_IS_GLUE glue query
+% QUERY_IS_GLUE glue query (%1/%2)
 Debug information. The last DO_QUERY is query for glue addresses.
 
-% QUERY_IS_NOGLUE query for non-glue addresses
+% QUERY_IS_NOGLUE query for non-glue addresses (%1/%2)
 Debug information. The last DO_QUERY is query for addresses that are not
 glue.
 
-% QUERY_IS_REF query for referral
+% QUERY_IS_REF query for referral (%1/%2)
 Debug information. The last DO_QUERY is query for referral information.
 
 % QUERY_SIMPLE_FAIL the underlying data source failed with %1
-We queried the data source to answer a simple query and it returned error
-(1 is some error, 2 is not implemented). The data source should have logged
-the specific error already.
+The underlying data source failed to answer the simple query. 1 means some
+error, 2 is not implemented. The data source should have logged the specific
+error already.
 
 % QUERY_AUTH_FAIL the underlying data source failed with %1
-We queried the data source to answer authoritative query and it returned
-error (1 is some error, 2 is not implemented). The data source should have
-log the specific error already.
+The underlying data source failed to answer the authoritative query. 1 means
+some error, 2 is not implemented. The data source should have logged the
+specific error already.
 
 % QUERY_GLUE_FAIL the underlying data source failed with %1
-We queried the data source to answer query for glue addresses and it returned
-error (1 is some error, 2 is not implemented). The data source should have
-log the specific error already.
+The underlying data source failed to answer the glue query. 1 means some error,
+2 is not implemented. The data source should have logged the specific error
+already.
 
 % QUERY_NOGLUE_FAIL the underlying data source failed with %1
-We queried the data source to answer query for non-glue addresses and it
-returned error (1 is some error, 2 is not implemented). The data source
-should have log the specific error already.
+The underlying data source failed to answer the no-glue query. 1 means some
+error, 2 is not implemented. The data source should have logged the specific
+error already.
 
 % QUERY_REF_FAIL the underlying data source failed with %1
-We queried the data source to answer query for referral and it
-returned error (1 is some error, 2 is not implemented). The data source
-should have log the specific error already.
+The underlying data source failed to answer the query for referral information.
+1 means some error, 2 is not implemented. The data source should have logged
+the specific error already.
 
 % QUERY_INVALID_OP invalid query operation requested
 This indicates a programmer error. The DO_QUERY was called with unknown
 operation code.
 
 % QUERY_ADD_RRSET adding RRset '%1/%2' to message
-Debug information. We're adding the RRset to answer message.
+Debug information. An RRset is being added to the response message.
 
 % QUERY_COPY_AUTH copying authoritative section into message
-Debug information. We're copying referral information into authoritative
-section of the response message.
+Debug information. The whole referral information is being copied into the
+response message.
 
 % QUERY_DELEGATION looking for delegation on the path to '%1'
-Debug information. We're looking if there's a delegation point on the way
-down to the given domain.
+Debug information. The software is trying to identify delegation points on the
+way down to the given domain.
 
 % QUERY_ADD_SOA adding SOA of '%1'
-Debug information. We're adding a SOA record for the given zone into the
-authority section.
+Debug information. A SOA record of the given zone is being added to the
+authority section of the response message.
 
 % QUERY_ADD_NSEC adding NSEC record for '%1'
-Debug information. We're adding NSEC record for this domain.
+Debug information. A NSEC record covering this zone is being added.
 
 % QUERY_ADD_NSEC3 adding NSEC3 record of zone '%1'
-Debug information. We're adding an NSEC3 record for this zone.
+Debug information. A NSEC3 record for the given zone is being added to the
+response message.
 
 % QUERY_NO_DS_NSEC3 there's no DS record in the '%1' zone
-We tried to insert a NSEC3 record into the message. But we didn't find a DS
-record for this zone.
+An attempt to add a NSEC3 record into the message failed, because the zone does
+not have any DS record. This indicates problem with the provided data.
 
 % QUERY_NO_DS_NSEC there's no DS record in the '%1' zone
-We tried to insert a NSEC record into the message. But we didn't find a DS
-record for this zone.
+An attempt to add a NSEC record into the message failed, because the zone does
+not have any DS record. This indicates problem with the provided data.
 
 % QUERY_WILDCARD looking for a wildcard covering '%1'
-Debug information. We didn't find a direct match, so we're trying to find if
-there's a wildcard we could use to answer the query.
+Debug information. A direct match wasn't found, so a wildcard covering the
+domain is being looked for now.
 
 % QUERY_WILDCARD_PROVENX_FAIL unable to prove nonexistence of '%1' (%2)
-While processing a wildcard, we tried to prove nonexistence of the given
-domain or record. The code is 1 for error and 2 for not implemented.
+While processing a wildcard, it wasn't possible to prove nonexistence of the
+given domain or record.  The code is 1 for error and 2 for not implemented.
 
 % QUERY_WILDCARD_REFERRAL unable to find referral info for '%1' (%2)
-While processing a wildcard we met a referral. But we were not able to get
-information for it. The code is 1 for error, 2 for not implemented.
+While processing a wildcard, a referral was met. But it wasn't possible to get
+enough information for it.  The code is 1 for error, 2 for not implemented.
 
 % QUERY_PROCESS processing query '%1/%2' in the '%3' class
-Debug information. We're starting to process a user query.
+Debug information. A sure query is being processed now.
 
 % QUERY_RRSIG unable to answer RRSIG query
 The server is unable to answer a direct query for RRSIG type, but was asked
 to do so.
 
 % QUERY_MISPLACED_TASK task of this type should not be here
-This indicates a programming error. We found a task in the internal task
-queue which wasn't supposed to ever be put into the queue, but handled
-directly.
+This indicates a programming error. A task was found in the internal task
+queue, but this kind of task wasn't designed to be inside the queue (it should
+be handled right away, not queued).
 
 % QUERY_TASK_FAIL task failed with %1
 The query subtask failed. The reason should have been reported by the subtask
 already. The code is 1 for error, 2 for not implemented.
 
 % QUERY_MISSING_NS missing NS records for '%1'
-We wanted to put the nameserver records into the authority section, but we
-discovered the zone doesn't have them. This indicates problem with provided
-data.
+NS records should have been put into the authority section. However, this zone
+has none. This indicates problem with provided data.
 
 % UNEXPECTED_QUERY_STATE unexpected query state
-This indicates a programming error. We generated an internal task of type
-unknown to us.
+This indicates a programming error. An internal task of unknown type was
+generated.
 
 % QUERY_FAIL query failed
 Some subtask of query processing failed. The reason should have been reported
 already. We are returning SERVFAIL.
 
 % QUERY_BAD_REFERRAL bad referral to '%1'
-We discovered that the domain lives in another zone. But we are not able to
-generate referral information to it.
+The domain lives in another zone. But it is not possible to generate referral
+information for it.
 
 % QUERY_WILDCARD_FAIL error processing wildcard for '%1'
-We tried to find a wildcard to cover the domain, but there happened to be
-some (hopefully already reported) error for it.
+During an attempt to cover the domain by a wildcard an error happened. The
+exact kind was hopefully already reported.
 
 % QUERY_MISSING_SOA the zone '%1' has no SOA
-We tried to answer negatively, but there's no SOA record in the zone.
+The answer should have been a negative one (eg. of nonexistence of something).
+To do so, a SOA record should be put into the authority section, but the zone
+does not have one. This indicates problem with provided data.
 
 % QUERY_PROVENX_FAIL unable to prove nonexistence of '%1'
 The user wants DNSSEC and we discovered the entity doesn't exist (either
@@ -259,23 +259,22 @@ to prove the nonexistence.
 
 % QUERY_UNKNOWN_RESULT unknown result of subtask
 This indicates a programmer error. The answer of subtask doesn't look like
-anything we would know.
+anything known.
 
 % META_ADD adding a data source into meta data source
-Debug information. We add yet another data source into the meta data source
-(probably at startup or reconfiguration).
+Debug information. Yet another data source is being added into the meta data
+source. (probably at startup or reconfiguration)
 
 % META_ADD_CLASS_MISMATCH mismatch between classes '%1' and '%2'
-We tried to add a data source of one class into a meta data source of a
-different type. The types must be the same.
+It was attempted to add a data source into a meta data source. But their
+classes do not match.
 
 % META_REMOVE removing data source from meta data source
-Debug information. We take a data source out of meta data source (probably
-at shutdown or reconfiguration).
+Debug information. A data source is being removed from meta data source.
 
 % MEM_ADD_WILDCARD adding wildcards for '%1'
-Debug information. We need some special marks above each * in wildcard name
-in the in-memory data source. We are adding the marks for this name now.
+Debug information. Some special marks above each * in wildcard name are needed.
+They are being added now for this name.
 
 % MEM_CNAME_TO_NONEMPTY can't add CNAME to domain with other data in '%1'
 Someone or something tried to add a CNAME into a domain that already contains
@@ -301,60 +300,58 @@ It was attempted to add the domain into a zone that shouldn't have it
 problem with provided data.
 
 % MEM_WILDCARD_NS nS record in wildcard domain '%1'
-We refuse to load NS record into a wildcard domain. It is'n explicitly
-forbidden, but the protocol is ambiguous about how this should behave and
-BIND 9 refuses that as well. We don't like your zone, please describe it
-using different tools.
+The software refuses to load NS records into a wildcard domain.  It isn't
+explicitly forbidden, but the protocol is ambiguous about how this should
+behave and BIND 9 refuses that as well. Please describe your intention using
+different tools.
 
 % MEM_WILDCARD_DNAME dNAME record in wildcard domain '%1'
-We refuse to load DNAME record into a wildcard domain. It is'n explicitly
-forbidden, but the protocol is ambiguous about how this should behave and
-BIND 9 refuses that as well. We don't like your zone, please describe it
-using different tools.
+The software refuses to load DNAME records into a wildcard domain.  It isn't
+explicitly forbidden, but the protocol is ambiguous about how this should
+behave and BIND 9 refuses that as well. Please describe your intention using
+different tools.
 
 % MEM_ADD_RRSET adding RRset '%1/%2' into zone '%3'
-Debug information. We're adding an RRset to the zone of in-memory data
-source.
+Debug information. An RRset is being added to the in-memory data source.
 
 % MEM_DUP_RRSET duplicate RRset '%1/%2'
-An RRset is being inserted into in-memory data source for a second time.
-The original version must be removed first. Note that we don't support
-loading master files where an RRset is split into multiple locations yet.
+An RRset is being inserted into in-memory data source for a second time.  The
+original version must be removed first. Note that loading master files where an
+RRset is split into multiple locations is not supported yet.
 
 % MEM_DNAME_ENCOUNTERED encountered a DNAME
-Debug information. While searching for the requested domain, we encountered
-a DNAME on the way. This may lead to redirection to a different domain and
+Debug information. While searching for the requested domain, a DNAME was
+encountered on the way.  This may lead to redirection to a different domain and
 stop the search.
 
 % MEM_NS_ENCOUNTERED encountered a NS
-Debug information. While searching for the requested domain, we encountered
-a NS on the way (a delegation). This may lead to stop of the search.
+Debug information. While searching for the requested domain, a NS was
+encountered on the way (a delegation). This may lead to stop of the search.
 
 % MEM_RENAME renaming RRset from '%1' to '%2'
-Debug information. We generate an RRset from a different RRset (most probably
-a wildcard). So we need to rename it to whatever the user asked for. In fact,
-we can't rename RRset (it's not possible with our libraries), so we create
-a new one and copy everything.
+Debug information. A RRset is being generated from a different RRset (most
+probably a wildcard). So it must be renamed to whatever the user asked for. In
+fact, it's impossible to rename RRsets with our libraries, so a new one is
+created and all resource records are copied over.
 
 % MEM_FIND find '%1/%2'
-Debug information. We're going to search the in-memory data source to find
-requestet RRset.
+Debug information. A search for the requested RRset is being started.
 
-% MEM_DNAME_FOUND dNAME found at '%1'
-Debug information. We found a DNAME instead of the requested record.
+% MEM_DNAME_FOUND DNAME found at '%1'
+Debug information. A DNAME was found instead of the requested information.
 
 % MEM_DELEG_FOUND delegation found at '%1'
-Debug information. We found a delegation point above the requested record.
+Debug information. A delegation point was found above the requested record.
 
 % MEM_SUPER_STOP stopped at superdomain, domain is empty
 Debug information. The search stopped at a superdomain of the requested
-domain. The domain is a empty nonterminal, therefore we treat it as NXRRSET
+domain. The domain is a empty nonterminal, therefore it is treated  as NXRRSET
 case (eg. the domain exists, but it doesn't have the requested record type).
 
 % MEM_WILDCARD_CANCEL wildcard match canceled
-Debug information. We reached a domain above wildcard, but there's something
-below the requested domain. Therefore the wildcard doesn't apply here.
-This behaviour is specified by RFC 1034, section 4.3.3
+Debug information. A domain above wildcard was reached, but there's something
+below the requested domain. Therefore the wildcard doesn't apply here.  This
+behaviour is specified by RFC 1034, section 4.3.3
 
 % MEM_NOTFOUND requested domain not found
 Debug information. The requested domain does not exist.
@@ -368,12 +365,12 @@ Debug information. There's a NS record at the requested domain. This means
 this zone is not authoritative for the requested domain, but a delegation
 should be followed. The requested domain is an apex of some zone.
 
-% MEM_ANY_SUCCESS aNY query successful
-Debug information. The domain was found and we answer an ANY type query by
-providing everything we found inside the domain.
+% MEM_ANY_SUCCESS ANY query successful
+Debug information. The domain was found and an ANY type query is being answered
+by providing everything found inside the domain.
 
 % MEM_SUCCESS query successful
-Debug information. We found the record we searched for.
+Debug information. The requested record was found.
 
 % MEM_CNAME cNAME at the domain
 Debug information. The requested domain is an alias to a different domain,
@@ -384,38 +381,39 @@ Debug information. The domain exists, but it doesn't hold any record of the
 requested type.
 
 % MEM_CREATE creating zone '%1' in '%2' class
-Debug information. We're creating representation of a zone for the in-memory
-data source.
+Debug information. A representation of a zone for the in-memory data source is
+being created.
 
 % MEM_DESTROY destroying zone '%1' in '%2' class
-Debug information. We're destroying the representation of zone in the
-in-memory data source.
+Debug information. A zone from in-memory data source is being destroyed.
 
 % MEM_LOAD loading zone '%1' from file '%2'
-Debug information. We're loading the content of zone from a master file.
+Debug information. The content of master file is being loaded into the memory.
 
 % MEM_SWAP swapping contents of two zone representations ('%1' and '%2')
-Debug information. We exchange contents of the zones. This is usual practice
-to do some manipulation in exception-safe manner -- we prepare the new data
-in a different zone object and when it works, we swap it with the old, then
-we can safely destroy the old one.
+Debug information. The contents of two in-memory zones are being exchanged.
+This is usual practice to do some manipulation in exception-safe manner -- the
+new data are prepared in a different zone object and when it works, they are
+swapped. The old one contains the new data and the other one can be safely
+destroyed.
 
 % MEM_ADD_ZONE adding zone '%1/%2'
-Debug information. We're adding this zone into the in-memory data source.
+Debug information. A zone is being added into the in-memory data source.
 
 % MEM_FIND_ZONE looking for zone '%1'
-Debug information. We're looking for a zone in the in-memory data source.
+Debug information. A zone object for this zone is being searched for in the
+in-memory data source.
 
 % STATIC_CREATE creating the static datasource
-Debug information. We're creating the static data source (the one holding
-stuff like version.bind).
+Debug information. The static data source (the one holding stuff like
+version.bind) is being created.
 
 % STATIC_BAD_CLASS static data source can handle CH only
 For some reason, someone asked the static data source a query that is not in
 the CH class.
 
 % STATIC_FIND looking for '%1/%2'
-Debug information. We're looking for this resource record set in the static
+Debug information. This resource record set is being looked up in the static
 data source.
 
 % SQLITE_FINDREC looking for record '%1/%2'
@@ -478,23 +476,23 @@ Debug information. The SQLite data source is identifying if this domain is
 a referral and where it goes.
 
 % SQLITE_FINDREF_BAD_CLASS class mismatch looking for referral ('%1' and '%2')
-The SQLite data source was trying to identify, if there's a referral. But the
-but it contains different class than the query was for.
+The SQLite data source was trying to identify, if there's a referral. But
+it contains different class than the query was for.
 
 % SQLITE_CREATE sQLite data source created
-Debug information. We're creating an instance of the SQLite data source.
+Debug information. An instance of SQLite data source is being created.
 
 % SQLITE_DESTROY sQLite data source destroyed
-Debug information. We're destroying an instance of SQLite data source.
+Debug information. An instance of SQLite data source is being destroyed.
 
 % SQLITE_SETUP setting up SQLite database
-The database for SQLite data source was found empty. So we're assuming this
-is the first run and we initialize it with current schema. It'll still
-contain no data, but it will be ready for use.
+The database for SQLite data source was found empty. It is assumed this is the
+first run and it is being initialized with current schema.  It'll still contain
+no data, but it will be ready for use.
 
 % SQLITE_OPEN opening SQLite database '%1'
 Debug information. The SQLite data source is loading an SQLite database in
-the provide file.
+the provided file.
 
 % SQLITE_CLOSE closing SQLite database
 Debug information. The SQLite data source is closing the database file.