Merge from trunk

diff --cc errors/Makefile.am
index 593abf3b1ab3fcad72f7928353fb6e52d72b60ed,6c53194645271369b5d616a28118939723d1148a..79839d25aa6e28f01b559ad1b0acb6d997926351
--- 1/errors/Makefile.am
--- 2/errors/Makefile.am
+++ b/errors/Makefile.am
@@@ -72,15 -70,7 +72,15 @@@ install-data-local
                        $(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
                done; \
          fi \
 -      done
 +      done; \
-         $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
-         @if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
-                 echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
++        $(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET).default; \
++        @if test -f $(DEFAULT_STYLESHEET) ; then \
++                echo "$@ will not overwrite existing $(DEFAULT_STYLESHEET)" ; \
 +        else \
-                 echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
-                 $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
++                echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET)"; \
++                $(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET); \
 +        fi
 +
  
  uninstall-local:
        @ for l in $(LANGUAGES); do \

diff --cc src/Makefile.am
Simple merge

diff --cc src/cf.data.pre
index e5655511edb4206f58ecdb0c864120e97f054119,452e0c591090b437ab35c5f66eeefbef3f1ee339..79775c422674463632a872c063e2d0857ba5dce1
--- 1/src/cf.data.pre
--- 2/src/cf.data.pre
+++ b/src/cf.data.pre
@@@ -4786,16 -4800,20 +4800,30 @@@ DOC_STAR
        http://wiki.squid-cache.org/Translations
  DOC_END
  
+ NAME: error_log_languages
+ IFDEF: USE_ERR_LOCALES
+ TYPE: onoff
+ LOC: Config.errorLogMissingLanguages
+ DEFAULT: on
+ DOC_START
+       Log to cache.log what languages users are attempting to
+       auto-negotiate for translations.
+ 
+       Successful negotiations are not logged. Only failures
+       have meaning to indicate that Squid may need an upgrade
+       of is error page translations.
+ DOC_END
+ 
 +NAME: err_page_stylesheet
 +TYPE: string
 +LOC: Config.errorStylesheet
 +DEFAULT: @DEFAULT_CONFIG_DIR@/errorpage.css
 +DOC_START
 +      CSS Stylesheet to pattern the display of Squid default error pages.
 +
 +      For information on CSS see http://www.w3.org/Style/CSS/
 +DOC_END
 +
  NAME: err_html_text
  TYPE: eol
  LOC: Config.errHtmlText

diff --cc src/errorpage.cc
Simple merge

diff --cc src/structs.h
index 77b905b66a76e406f6265aea5e3387ddb47cf951,6057b4ba425b965916ed1c174bf8177df175a4c7..03d12d298abb8c0e88a46d6f1d3d4a3de056296f
--- 1/src/structs.h
--- 2/src/structs.h
+++ b/src/structs.h
@@@ -550,8 -550,8 +550,9 @@@ struct SquidConfi
      char *errorDirectory;
  #if USE_ERR_LOCALES
      char *errorDefaultLanguage;
+     int errorLogMissingLanguages;
  #endif
 +    char *errorStylesheet;
  
      struct
      {