From 3f78fb0213da9614f365ee0e48cfd843e422125b Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Thu, 29 Oct 2015 09:18:20 +0100
Subject: [PATCH] Current state

---
 .../etc/locale.gen.dist                       |  0
 config-archive/etc/locale.gen.dist.new        | 31 -------------------
 locale.gen                                    | 13 +++++---
 3 files changed, 9 insertions(+), 35 deletions(-)
 rename ._cfg0000_locale.gen => config-archive/etc/locale.gen.dist (100%)
 delete mode 100644 config-archive/etc/locale.gen.dist.new

diff --git a/._cfg0000_locale.gen b/config-archive/etc/locale.gen.dist
similarity index 100%
rename from ._cfg0000_locale.gen
rename to config-archive/etc/locale.gen.dist
diff --git a/config-archive/etc/locale.gen.dist.new b/config-archive/etc/locale.gen.dist.new
deleted file mode 100644
index 09ee60e..0000000
--- a/config-archive/etc/locale.gen.dist.new
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/locale.gen: list all of the locales you want to have on your system
-#
-# The format of each line:
-# <locale> <charmap>
-#
-# Where <locale> is a locale located in /usr/share/i18n/locales/ and
-# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
-#
-# All blank lines and lines starting with # are ignored.
-#
-# For the default list of supported combinations, see the file:
-# /usr/share/i18n/SUPPORTED
-#
-# Whenever glibc is emerged, the locales listed here will be automatically
-# rebuilt for you.  After updating this file, you can simply run `locale-gen`
-# yourself instead of re-emerging glibc.
-
-#en_US ISO-8859-1
-#en_US.UTF-8 UTF-8
-#ja_JP.EUC-JP EUC-JP
-#ja_JP.UTF-8 UTF-8
-#ja_JP EUC-JP
-#en_HK ISO-8859-1
-#en_PH ISO-8859-1
-#de_DE ISO-8859-1
-#de_DE@euro ISO-8859-15
-#es_MX ISO-8859-1
-#fa_IR UTF-8
-#fr_FR ISO-8859-1
-#fr_FR@euro ISO-8859-15
-#it_IT ISO-8859-1
diff --git a/locale.gen b/locale.gen
index 6e91a79..0ed9eb8 100644
--- a/locale.gen
+++ b/locale.gen
@@ -1,10 +1,15 @@
-# /etc/locale.gen: list all of the locales you want to have on your system
+# /etc/locale.gen: list all of the locales you want to have on your system.
+# See the locale.gen(5) man page for more details.
 #
 # The format of each line:
-# <locale> <charmap>
+# <locale name> <charset>
 #
-# Where <locale> is a locale located in /usr/share/i18n/locales/ and
-# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
+# Where <locale name> starts with a name as found in /usr/share/i18n/locales/.
+# It must be unique in the file as it is used as the key to locale variables.
+# For non-default encodings, the <charset> is typically appended.
+#
+# Where <charset> is a charset located in /usr/share/i18n/charmaps/ (sans any
+# suffix like ".gz").
 #
 # All blank lines and lines starting with # are ignored.
 #
-- 
2.39.5