This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 468de80470ab5109b48c2b22b5cd7e25562eb349 (commit) via 59ec45954d02b7b843e44205d52a3161291b4475 (commit) via 504e72e17317e9b153d5dc6c0198c6df7c5f750a (commit) via 7b0c6a5b3a12535831f1418b9dc5f6385e0c033d (commit) via 758565ce8655e33a01cbcdd8ec5daac85b055a9f (commit) via 84624b2a3687ef3250c2fb8aeed0565f72e6c5de (commit) via 45b1fc5c7f9c7cba421293c3d93735916cc65d72 (commit) via 62cd95c2994deb7aaf4b740406ce5a827e4d3b88 (commit) via cea9d7b39810c91a12e7773217758abebe26466d (commit) via dfe45e35ebe2be575657f52d601fd3aca59ca5a4 (commit) via 7ae1dcb33e27d2ea354acd6e7093741781e4092d (commit) via b119887b50675121a30d889fdbfc6c342e068c5a (commit) via c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 (commit) via 59ebcaedbd5a1cc2a451c80460f674c312edbcd8 (commit) from 81fba4196118d18441c6f495694e5527dc89c11e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 468de80470ab5109b48c2b22b5cd7e25562eb349 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 18 09:33:47 2021 +0000
Update contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 59ec45954d02b7b843e44205d52a3161291b4475 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 18 09:33:32 2021 +0000
Update language errors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 504e72e17317e9b153d5dc6c0198c6df7c5f750a Merge: 7b0c6a5b3 81fba4196 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 18 09:33:05 2021 +0000
Merge branch 'next'
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/aarch64/samba | 4 ++++ config/rootfiles/packages/i586/samba | 4 ++++ doc/language_issues.de | 3 +++ doc/language_issues.en | 3 --- doc/language_issues.es | 3 ++- doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 ++- doc/language_issues.ru | 3 ++- doc/language_issues.tr | 3 +++ html/cgi-bin/credits.cgi | 1 + 12 files changed, 30 insertions(+), 6 deletions(-)
Difference in files: diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 88b7905ce..ddc964c5c 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -701,7 +701,11 @@ usr/lib/samba/libposix-eadb-samba4.so usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2 +<<<<<<< HEAD +usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.1 +======= usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.3.0 +>>>>>>> next usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2 usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.2 usr/lib/samba/libregistry-samba4.so diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 6b43544f1..d302dd703 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -701,7 +701,11 @@ usr/lib/samba/libposix-eadb-samba4.so usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2 +<<<<<<< HEAD +usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.1 +======= usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.3.0 +>>>>>>> next usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2 usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.2 usr/lib/samba/libregistry-samba4.so diff --git a/doc/language_issues.de b/doc/language_issues.de index 4983e20c6..8500501fd 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -828,6 +828,9 @@ WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support +WARNING: translation string unused: wlan clients +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert diff --git a/doc/language_issues.en b/doc/language_issues.en index 4e6a201fd..620f81738 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2144,7 +2144,6 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced @@ -2161,8 +2160,6 @@ WARNING: untranslated string: wlanap encryption = Encryption WARNING: untranslated string: wlanap informations = Informations WARNING: untranslated string: wlanap interface = Select interface WARNING: untranslated string: wlanap invalid wpa = Invalid length in WPA Passphrase. Must be between 8 and 63 characters. -WARNING: untranslated string: wlanap link dhcp = Wireless lan DHCP configuration -WARNING: untranslated string: wlanap link wireless = Activate wireless lan clients WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.es b/doc/language_issues.es index d9c512af4..ee15abb84 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -773,6 +773,8 @@ WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert @@ -1522,7 +1524,6 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced diff --git a/doc/language_issues.fr b/doc/language_issues.fr index e993c6313..e675c6f0c 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -868,6 +868,9 @@ WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support +WARNING: translation string unused: wlan clients +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert diff --git a/doc/language_issues.it b/doc/language_issues.it index 15ad4f896..50c1dcd3f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -841,7 +841,10 @@ WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support +WARNING: translation string unused: wlan clients WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 1a60d83a6..6dbaea863 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -835,7 +835,10 @@ WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support +WARNING: translation string unused: wlan clients WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert diff --git a/doc/language_issues.pl b/doc/language_issues.pl index e0fb9fd5e..e78b969eb 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -757,6 +757,8 @@ WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert @@ -1530,7 +1532,6 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d5bdbe658..d7f1083de 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -752,6 +752,8 @@ WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert @@ -1525,7 +1527,6 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 1445f8641..14a95d847 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -871,6 +871,9 @@ WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support +WARNING: translation string unused: wlan clients +WARNING: translation string unused: wlanap link dhcp +WARNING: translation string unused: wlanap link wireless WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index ccf74ef1a..80b18891f 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -140,6 +140,7 @@ Paul T. Simmons, Rob Brewer, Robert Möker, Roberto Peña, +Robin Roevens, Stefan Ernst, Stefan Ferstl, Steffen Klammer,
hooks/post-receive -- IPFire 2.x development tree