Merge #2376

Conflicts:
	src/lib/datasrc/datasrc_messages.mes

diff --cc src/lib/datasrc/Makefile.am
Simple merge

diff --cc src/lib/datasrc/datasrc_messages.mes
index 3359d24ef72797abf7e9a44fd55abd586c69bb40,94e4140fa367ae0cab7bef2064a5546f7433aa85..e7cb9d3f9d8ce9492c3cc39a82740a8f7efefda4
--- 1/src/lib/datasrc/datasrc_messages.mes
--- 2/src/lib/datasrc/datasrc_messages.mes
+++ b/src/lib/datasrc/datasrc_messages.mes
@@@ -305,16 -305,23 +305,28 @@@ Therefore, the zone will not be availab
  a problem, you should move the zone to some database backend (sqlite3, for
  example) and use it from there.
  
 -% DATASRC_MASTERLOAD_ERROR %1
 -An error was found in the zone data for a MasterFiles zone. The zone
 -is not loaded. The specific error is shown in the message, and should
 -be addressed.
 -
 +% DATASRC_LOAD_FROM_FILE_ERROR Error loading zone %1: %2
 +An error was found in the zone data when it was being loaded from a
 +file. The zone was not loaded. The specific error is shown in the
 +message, and should be addressed.
 +
 +% DATASRC_LOAD_FROM_ITERATOR_ERROR Error loading zone %1: %2
 +An error was found in the zone data when it was being loaded from
 +another data source. The zone was not loaded. The specific error is
 +shown in the message, and should be addressed.
 +
+ % DATASRC_MASTER_LOAD_ERROR %1:%2: Zone '%3/%4' contains error: %5
+ There's an error in the given master file. The zone won't be loaded for
+ this reason. Parsing might follow, so you might get further errors and
+ warnings to fix everything at once. But in case the error is serious enough,
+ the parser might just give up or get confused and generate false errors
+ afterwards.
+ 
+ % DATASRC_MASTER_LOAD_WARN %1:%2: Zone '%3/%4' has a potential problem: %5
+ There's something suspicious in the master file. This is a warning only.
+ It may be a problem or it may be harmless, but it should be checked.
+ This problem does not stop the zone from being loaded.
+ 
  % DATASRC_MEM_ADD_RRSET adding RRset '%1/%2' into zone '%3'
  Debug information. An RRset is being added to the in-memory data source.