- Add 'default_charset' option to user preferences (#1485451)

2 files changed, 43 insertions, 4 deletions

diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 5e9c968ef..3462b8da8 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -64,10 +64,6 @@ $labels['download'] = 'Download';
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
 
-$labels['preferhtml'] = 'Display HTML';
-$labels['htmlmessage'] = 'HTML Message';
-$labels['prettydate'] = 'Pretty dates';
-
 $labels['addtoaddressbook'] = 'Add to address book';
 
 // weekdays short
@@ -265,6 +261,10 @@ $labels['newidentity']  = 'New identity';
 $labels['newitem']  = 'New item';
 $labels['edititem']  = 'Edit item';
 
+$labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['prettydate'] = 'Pretty dates';
 $labels['setdefault']  = 'Set default';
 $labels['autodetect']  = 'Auto';
 $labels['language']  = 'Language';
@@ -350,4 +350,24 @@ $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+																												
 ?>
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index c00d73c06..3ceb0ac32 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -218,6 +218,7 @@ $labels['language'] = 'Język';
 $labels['timezone'] = 'Strefa czasowa';
 $labels['pagesize'] = 'Liczba wierszy na stronie';
 $labels['signature'] = 'Podpis';
+$labels['defaultcharset'] = 'Domyślny zestaw znaków';
 $labels['dstactive'] = 'Czas letni';
 $labels['htmleditor'] = 'Twórz wiadomości HTML';
 $labels['htmlsignature'] = 'Podpis w HTML';
@@ -296,5 +297,23 @@ $labels['replysignaturepos'] = 'Podczas odpowiedzi wstaw podpis';
 $labels['belowquote'] = 'poniżej cytowanej treści';
 $labels['abovequote'] = 'ponad cytowaną treścią';
 
+$labels['unicode'] = 'uniwersalny';
+$labels['english'] = 'angielski';
+$labels['westerneuropean'] = 'zachodnioeuropejski';
+$labels['easterneuropean'] = 'wschodnioeuropejski';
+$labels['southeasterneuropean'] = 'południowo-wschodnioeuropejski';
+$labels['baltic'] = 'bałtycki';
+$labels['cyrillic'] = 'cyrylica';
+$labels['arabic'] = 'arabski';
+$labels['greek'] = 'grecki';
+$labels['hebrew'] = 'hebrajski';
+$labels['turkish'] = 'turecki';
+$labels['nordic'] = 'nordycki';
+$labels['thai'] = 'tajski';
+$labels['celtic'] = 'celtycki';
+$labels['vietnamese'] = 'wietnamski';
+$labels['japanese'] = 'japoński';
+$labels['korean'] = 'koreański';
+$labels['chinese'] = 'chiński';
 
 ?>