Merge remote-tracking branch 'origin/next' into install-raid
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 20:02:42 +0000 (22:02 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 20:02:42 +0000 (22:02 +0200)
Conflicts:
lfs/bash

1  2 
config/rootfiles/common/bash
lfs/bash
make.sh

@@@ -13,47 -13,44 +13,86 @@@ bin/bas
  #usr/share/doc/bash/bash.html
  #usr/share/doc/bash/bashref.html
  #usr/share/info/bash.info
 +#usr/share/locale/af/LC_MESSAGES/bash.mo
 +#usr/share/locale/bg/LC_MESSAGES/bash.mo
 +#usr/share/locale/ca/LC_MESSAGES/bash.mo
 +#usr/share/locale/cs/LC_MESSAGES/bash.mo
 +#usr/share/locale/da/LC_MESSAGES/bash.mo
 +#usr/share/locale/de/LC_MESSAGES/bash.mo
 +#usr/share/locale/el/LC_MESSAGES/bash.mo
 +#usr/share/locale/en@boldquot
 +#usr/share/locale/en@boldquot/LC_MESSAGES
 +#usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
 +#usr/share/locale/en@quot
 +#usr/share/locale/en@quot/LC_MESSAGES
 +#usr/share/locale/en@quot/LC_MESSAGES/bash.mo
 +#usr/share/locale/eo/LC_MESSAGES/bash.mo
 +#usr/share/locale/es/LC_MESSAGES/bash.mo
 +#usr/share/locale/et/LC_MESSAGES/bash.mo
 +#usr/share/locale/fi/LC_MESSAGES/bash.mo
 +#usr/share/locale/fr/LC_MESSAGES/bash.mo
 +#usr/share/locale/ga/LC_MESSAGES/bash.mo
 +#usr/share/locale/gl/LC_MESSAGES/bash.mo
 +#usr/share/locale/hr/LC_MESSAGES/bash.mo
 +#usr/share/locale/hu/LC_MESSAGES/bash.mo
 +#usr/share/locale/id/LC_MESSAGES/bash.mo
 +#usr/share/locale/it/LC_MESSAGES/bash.mo
 +#usr/share/locale/ja/LC_MESSAGES/bash.mo
 +#usr/share/locale/lt/LC_MESSAGES/bash.mo
 +#usr/share/locale/nl/LC_MESSAGES/bash.mo
 +#usr/share/locale/pl/LC_MESSAGES/bash.mo
 +#usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 +#usr/share/locale/ro/LC_MESSAGES/bash.mo
 +#usr/share/locale/ru/LC_MESSAGES/bash.mo
 +#usr/share/locale/sk/LC_MESSAGES/bash.mo
 +#usr/share/locale/sl/LC_MESSAGES/bash.mo
 +#usr/share/locale/sr
 +#usr/share/locale/sr/LC_MESSAGES
 +#usr/share/locale/sr/LC_MESSAGES/bash.mo
 +#usr/share/locale/sv/LC_MESSAGES/bash.mo
 +#usr/share/locale/tr/LC_MESSAGES/bash.mo
 +#usr/share/locale/uk/LC_MESSAGES/bash.mo
 +#usr/share/locale/vi/LC_MESSAGES/bash.mo
 +#usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 +#usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
  #usr/share/man/man1/bash.1
  #usr/share/man/man1/bashbug.1
+ #usr/share/locale/af
+ #usr/share/locale/af/LC_MESSAGES
+ #usr/share/locale/af/LC_MESSAGES/bash.mo
+ #usr/share/locale/bg/LC_MESSAGES/bash.mo
+ #usr/share/locale/ca/LC_MESSAGES/bash.mo
+ #usr/share/locale/cs/LC_MESSAGES/bash.mo
+ #usr/share/locale/da/LC_MESSAGES/bash.mo
+ #usr/share/locale/de/LC_MESSAGES/bash.mo
+ #usr/share/locale/el/LC_MESSAGES/bash.mo
+ #usr/share/locale/en@boldquot
+ #usr/share/locale/en@boldquot/LC_MESSAGES
+ #usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
+ #usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+ #usr/share/locale/eo/LC_MESSAGES/bash.mo
+ #usr/share/locale/es/LC_MESSAGES/bash.mo
+ #usr/share/locale/et/LC_MESSAGES/bash.mo
+ #usr/share/locale/fi/LC_MESSAGES/bash.mo
+ #usr/share/locale/fr/LC_MESSAGES/bash.mo
+ #usr/share/locale/ga/LC_MESSAGES/bash.mo
+ #usr/share/locale/gl/LC_MESSAGES/bash.mo
+ #usr/share/locale/hr/LC_MESSAGES/bash.mo
+ #usr/share/locale/hu/LC_MESSAGES/bash.mo
+ #usr/share/locale/id/LC_MESSAGES/bash.mo
+ #usr/share/locale/it/LC_MESSAGES/bash.mo
+ #usr/share/locale/ja/LC_MESSAGES/bash.mo
+ #usr/share/locale/lt/LC_MESSAGES/bash.mo
+ #usr/share/locale/nl/LC_MESSAGES/bash.mo
+ #usr/share/locale/pl/LC_MESSAGES/bash.mo
+ #usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
+ #usr/share/locale/ro/LC_MESSAGES/bash.mo
+ #usr/share/locale/ru/LC_MESSAGES/bash.mo
+ #usr/share/locale/sk/LC_MESSAGES/bash.mo
+ #usr/share/locale/sl/LC_MESSAGES/bash.mo
+ #usr/share/locale/sr
+ #usr/share/locale/sr/LC_MESSAGES
+ #usr/share/locale/sr/LC_MESSAGES/bash.mo
+ #usr/share/locale/sv/LC_MESSAGES/bash.mo
+ #usr/share/locale/tr/LC_MESSAGES/bash.mo
+ #usr/share/locale/uk/LC_MESSAGES/bash.mo
diff --cc lfs/bash
+++ b/lfs/bash
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
--# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
++# Copyright (C) 2007-2014   IPFire Team   <info@ipfire.org>                   #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
diff --cc make.sh
Simple merge