From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Oct 2013 12:12:04 +0000 (+0200)
Subject: Merge branch 'next' into fifteen
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=568438067cfef263b683f97b9350776f62396e04;p=people%2Fdweismueller%2Fipfire-2.x.git

Merge branch 'next' into fifteen
---

568438067cfef263b683f97b9350776f62396e04
diff --cc doc/language_missings
index 704db02cc,7c7b08267..2dfa5c75e
--- a/doc/language_missings
+++ b/doc/language_missings
@@@ -11,8 -11,11 +11,10 @@@
  ############################################################################
  # Checking cgi-bin translations for language: fr                           #
  ############################################################################
 -< advproxy cache-digest
  < advproxy errmsg cache
  < advproxy errmsg invalid upstream proxy
+ < advproxy errmsg proxy ports equal
+ < advproxy proxy port transparent
  < age second
  < age seconds
  < age shour
@@@ -412,8 -240,11 +414,10 @@@
  ############################################################################
  # Checking cgi-bin translations for language: es                           #
  ############################################################################
 -< advproxy cache-digest
  < advproxy errmsg cache
  < advproxy errmsg invalid upstream proxy
+ < advproxy errmsg proxy ports equal
+ < advproxy proxy port transparent
  < age second
  < age seconds
  < age shour
@@@ -806,8 -462,11 +810,10 @@@
  ############################################################################
  # Checking cgi-bin translations for language: pl                           #
  ############################################################################
 -< advproxy cache-digest
  < advproxy errmsg cache
  < advproxy errmsg invalid upstream proxy
+ < advproxy errmsg proxy ports equal
+ < advproxy proxy port transparent
  < age second
  < age seconds
  < age shour
@@@ -1176,8 -660,11 +1182,10 @@@
  # Checking cgi-bin translations for language: ru                           #
  ############################################################################
  < Add a route
 -< advproxy cache-digest
  < advproxy errmsg cache
  < advproxy errmsg invalid upstream proxy
+ < advproxy errmsg proxy ports equal
+ < advproxy proxy port transparent
  < age second
  < age seconds
  < age shour