16 files changed, 423 insertions, 459 deletions

diff --git a/source3/po/de.msg b/source3/po/de.msg
index b1b84a21b6..c4c8fec0e7 100644
--- a/source3/po/de.msg
+++ b/source3/po/de.msg
@@ -23,13 +23,13 @@ msgstr ""
 "Last-Translator: Andreas Moroder\n"
 "Language-Team: (Samba Team) <samba-technical@samba.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../web/swat.c:117
 #, c-format
 msgid "ERROR: Can't open %s"
-msgstr "ERRORE: Kann %s nicht �ffnen"
+msgstr "ERRORE: Kann %s nicht öffnen"
 
 #: ../web/swat.c:200
 msgid "Help"
@@ -100,7 +100,7 @@ msgstr "Erweiterte Ansicht"
 
 #: ../web/swat.c:529
 msgid "Change View To"
-msgstr "�ndere Passwort"
+msgstr "Ändere Passwort"
 
 #: ../web/swat.c:554
 msgid "Current Config"
@@ -159,11 +159,11 @@ msgstr ""
 
 #: ../web/swat.c:734
 msgid "Domain Member"
-msgstr "Dom�nen master"
+msgstr "Domänen master"
 
 #: ../web/swat.c:735
 msgid "Domain Controller"
-msgstr "Dom�nen master"
+msgstr "Domänen master"
 
 #: ../web/swat.c:738
 msgid "Unusual Type in smb.conf - Please Select New Mode"
@@ -211,11 +211,11 @@ msgstr "Globale Variablen"
 
 #: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
 msgid "Commit Changes"
-msgstr "Speichere �nderungen"
+msgstr "Speichere Änderungen"
 
 #: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
 msgid "Reset Values"
-msgstr "Setze Werte zur�ck"
+msgstr "Setze Werte zurück"
 
 #: ../web/swat.c:844
 msgid "Share Parameters"
@@ -223,11 +223,11 @@ msgstr "Parameter der Freigabe"
 
 #: ../web/swat.c:887
 msgid "Choose Share"
-msgstr "W�hle Freigabe"
+msgstr "Wähle Freigabe"
 
 #: ../web/swat.c:901
 msgid "Delete Share"
-msgstr "L�sche Freigabe"
+msgstr "Lösche Freigabe"
 
 #: ../web/swat.c:908
 msgid "Create Share"
@@ -235,7 +235,7 @@ msgstr "Erstelle Freigabe"
 
 #: ../web/swat.c:944
 msgid "password change in demo mode rejected"
-msgstr "�nderung des Passworts im Demo modus nicht aktiv"
+msgstr "Änderung des Passworts im Demo modus nicht aktiv"
 
 #: ../web/swat.c:957
 msgid "Can't setup password database vectors."
@@ -247,29 +247,29 @@ msgstr " \"Benutzername\" muss angegeben werden "
 
 #: ../web/swat.c:999
 msgid " Must specify \"Old Password\" "
-msgstr " \"Altes Passwort\" mu� angegeben werden "
+msgstr " \"Altes Passwort\" muß angegeben werden "
 
 #: ../web/swat.c:1005
 msgid " Must specify \"Remote Machine\" "
-msgstr " \"Remote Maschine\" mu� angegeben werden "
+msgstr " \"Remote Maschine\" muß angegeben werden "
 
 #: ../web/swat.c:1012
 msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " \"Neues/Best�tige Passwort\" mu� angegeben werden "
+msgstr " \"Neues/Bestätige Passwort\" muß angegeben werden "
 
 #: ../web/swat.c:1018
 msgid " Re-typed password didn't match new password "
-msgstr " Das best�tigte Passwort stimmt nicht mit dem neuen Passwort �berein"
+msgstr " Das bestätigte Passwort stimmt nicht mit dem neuen Passwort überein"
 
 #: ../web/swat.c:1048
 #, c-format
 msgid " The passwd for '%s' has been changed."
-msgstr " Das Passwort f�r '%s' wurde ge�ndert."
+msgstr " Das Passwort für '%s' wurde geändert."
 
 #: ../web/swat.c:1051
 #, c-format
 msgid " The passwd for '%s' has NOT been changed."
-msgstr " Das Passwort f�r '%s' wurde nicht ge�ndert."
+msgstr " Das Passwort für '%s' wurde nicht geändert."
 
 #: ../web/swat.c:1076
 msgid "Server Password Management"
@@ -292,19 +292,19 @@ msgstr "Neues Passwort"
 
 #: ../web/swat.c:1093 ../web/swat.c:1138
 msgid "Re-type New Password"
-msgstr "Best�tige neues Passwort"
+msgstr "Bestätige neues Passwort"
 
 #: ../web/swat.c:1101 ../web/swat.c:1149
 msgid "Change Password"
-msgstr "�ndere Passwort"
+msgstr "Ändere Passwort"
 
 #: ../web/swat.c:1104
 msgid "Add New User"
-msgstr "F�ge Benutzer hinzu"
+msgstr "Füge Benutzer hinzu"
 
 #: ../web/swat.c:1106
 msgid "Delete User"
-msgstr "L�sche Benutzer"
+msgstr "Lösche Benutzer"
 
 #: ../web/swat.c:1108
 msgid "Disable User"
@@ -344,15 +344,15 @@ msgstr "Printcap Name"
 
 #: ../web/swat.c:1185
 msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Der Versuch diese Drucker von SWAT aus zu l�schen wird keine Auswirkung haben."
+msgstr "Der Versuch diese Drucker von SWAT aus zu löschen wird keine Auswirkung haben."
 
 #: ../web/swat.c:1231
 msgid "Choose Printer"
-msgstr "W�hle Drucker"
+msgstr "Wähle Drucker"
 
 #: ../web/swat.c:1250
 msgid "Delete Printer"
-msgstr "L�sche Drucker"
+msgstr "Lösche Drucker"
 
 #: ../web/swat.c:1257
 msgid "Create Printer"
@@ -558,7 +558,7 @@ msgstr "Verwaltung Dateinamen"
 
 #: ../param/loadparm.c:996
 msgid "Domain Options"
-msgstr "Dom�nen Optionen"
+msgstr "Domänen Optionen"
 
 #: ../param/loadparm.c:1000
 msgid "Logon Options"
diff --git a/source3/po/en.msg b/source3/po/en.msg
index 6a1fcb55ba..47d156239f 100644
--- a/source3/po/en.msg
+++ b/source3/po/en.msg
@@ -23,7 +23,7 @@ msgstr ""
 "Last-Translator: TAKAHASHI Motonobu <monyo@samba.org>\n"
 "Language-Team: (Samba Team) <samba-technical@samba.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=US-ASCII\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: \n"
 
 #: ../web/swat.c:117
diff --git a/source3/po/fr.msg b/source3/po/fr.msg
index 134f1d6390..8de5de7150 100644
--- a/source3/po/fr.msg
+++ b/source3/po/fr.msg
@@ -1,5 +1,5 @@
 # French messages for international release of SWAT.
-# Copyright (C) 2001 Fran�ois Le Lay <fanch@tuxfamily.org>
+# Copyright (C) 2001 François Le Lay <fanch@tuxfamily.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
@@ -20,10 +20,10 @@ msgstr ""
 "Project-Id-Version: i18n_swat \n"
 "POT-Creation-Date: 2003-10-06 05:30+0900\n"
 "PO-Revision-Date: 2000-02-08 14:45+0100\n"
-"Last-Translator: Fran�ois Le Lay <fanch@tuxfamily.org>\n"
+"Last-Translator: François Le Lay <fanch@tuxfamily.org>\n"
 "Language-Team: (Samba Team) <samba-technical@samba.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: \n"
 
 #: ../web/swat.c:117
@@ -37,7 +37,7 @@ msgstr "Aide"
 
 #: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
 msgid "Set Default"
-msgstr "D�finir par d�faut"
+msgstr "Définir par défaut"
 
 #: ../web/swat.c:408
 #, c-format
@@ -52,7 +52,7 @@ msgstr ""
 #: ../web/swat.c:501
 #, c-format
 msgid "Logged in as <b>%s</b>"
-msgstr "Connect� en tant que <b>%s</b>"
+msgstr "Connecté en tant que <b>%s</b>"
 
 #: ../web/swat.c:505
 msgid "Home"
@@ -60,7 +60,7 @@ msgstr "Home"
 
 #: ../web/swat.c:507
 msgid "Globals"
-msgstr "Param�tres G�n�raux"
+msgstr "Paramètres Généraux"
 
 #: ../web/swat.c:508
 msgid "Shares"
@@ -96,7 +96,7 @@ msgstr "Vue Basique"
 
 #: ../web/swat.c:528 ../web/swat.c:531
 msgid "Advanced"
-msgstr "Vue D�taill�e"
+msgstr "Vue Détaillée"
 
 #: ../web/swat.c:529
 msgid "Change View To"
@@ -112,7 +112,7 @@ msgstr "Vue Normale"
 
 #: ../web/swat.c:560
 msgid "Full View"
-msgstr "Vue Compl�te"
+msgstr "Vue Complète"
 
 #. Here we first set and commit all the parameters that were selected
 #. in the previous screen.
@@ -147,7 +147,7 @@ msgstr "commentaire"
 
 #: ../web/swat.c:726
 msgid "Edit Parameter Values"
-msgstr "Param�tres Imprimantes"
+msgstr "Paramètres Imprimantes"
 
 #: ../web/swat.c:732
 msgid "Server Type"
@@ -215,11 +215,11 @@ msgstr "Sauver les modifications"
 
 #: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
 msgid "Reset Values"
-msgstr "R�initialiser Valeurs"
+msgstr "Réinitialiser Valeurs"
 
 #: ../web/swat.c:844
 msgid "Share Parameters"
-msgstr "Param�tres de partage"
+msgstr "Paramètres de partage"
 
 #: ../web/swat.c:887
 msgid "Choose Share"
@@ -231,11 +231,11 @@ msgstr "Supprimer un partage"
 
 #: ../web/swat.c:908
 msgid "Create Share"
-msgstr "Cr�er un partage"
+msgstr "Créer un partage"
 
 #: ../web/swat.c:944
 msgid "password change in demo mode rejected"
-msgstr "changement de mot de passe en mode d�mo rejet�"
+msgstr "changement de mot de passe en mode démo rejeté"
 
 #: ../web/swat.c:957
 msgid "Can't setup password database vectors."
@@ -243,19 +243,19 @@ msgstr ""
 
 #: ../web/swat.c:983
 msgid " Must specify \"User Name\" "
-msgstr "  Le champ \"Nom d'utilisateur\" doit �tre sp�cifi�"
+msgstr "  Le champ \"Nom d'utilisateur\" doit être spécifié"
 
 #: ../web/swat.c:999
 msgid " Must specify \"Old Password\" "
-msgstr " Le champ  \"Ancien mot de passe\" do�t �tre sp�cifi�"
+msgstr " Le champ  \"Ancien mot de passe\" doît être spécifié"
 
 #: ../web/swat.c:1005
 msgid " Must specify \"Remote Machine\" "
-msgstr "  Le champ \"Machine Distante\" do�t �tre sp�cifi�"
+msgstr "  Le champ \"Machine Distante\" doît être spécifié"
 
 #: ../web/swat.c:1012
 msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr "Les champs \"Nouveau mot de passe\" et  \"Confirmation du nouveau mot de passe\" doivent �tre sp�cifi�s \n"
+msgstr "Les champs \"Nouveau mot de passe\" et  \"Confirmation du nouveau mot de passe\" doivent être spécifiés \n"
 
 #: ../web/swat.c:1018
 msgid " Re-typed password didn't match new password "
@@ -264,12 +264,12 @@ msgstr " Echec de la confirmation du nouveau mot de passe"
 #: ../web/swat.c:1048
 #, c-format
 msgid " The passwd for '%s' has been changed."
-msgstr " Le mot de passe de '%s' a �t� modifi�. "
+msgstr " Le mot de passe de '%s' a été modifié. "
 
 #: ../web/swat.c:1051
 #, c-format
 msgid " The passwd for '%s' has NOT been changed."
-msgstr " Le mot de passe de '%s' n'a PAS �t� modifi�. \n"
+msgstr " Le mot de passe de '%s' n'a PAS été modifié. \n"
 
 #: ../web/swat.c:1076
 msgid "Server Password Management"
@@ -308,7 +308,7 @@ msgstr "Supprimer Utilisateur"
 
 #: ../web/swat.c:1108
 msgid "Disable User"
-msgstr "D�sactiver Utilisateur"
+msgstr "Désactiver Utilisateur"
 
 #: ../web/swat.c:1110
 msgid "Enable User"
@@ -324,7 +324,7 @@ msgstr " Machine distante : "
 
 #: ../web/swat.c:1179
 msgid "Printer Parameters"
-msgstr "Param�tres Imprimantes"
+msgstr "Paramètres Imprimantes"
 
 #: ../web/swat.c:1181
 msgid "Important Note:"
@@ -332,11 +332,11 @@ msgstr "Note Importante:"
 
 #: ../web/swat.c:1182
 msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Les Noms d'imprimantes marqu�s du signe [*] dans le menu d�roulant Choisir Imprimante"
+msgstr "Les Noms d'imprimantes marqués du signe [*] dans le menu déroulant Choisir Imprimante"
 
 #: ../web/swat.c:1183
 msgid "are autoloaded printers from "
-msgstr "d�signent des imprimantes automatiquement charg�es depuis le "
+msgstr "désignent des imprimantes automatiquement chargées depuis le "
 
 #: ../web/swat.c:1184
 msgid "Printcap Name"
@@ -356,7 +356,7 @@ msgstr "Supprimer Imprimante"
 
 #: ../web/swat.c:1257
 msgid "Create Printer"
-msgstr "Cr�er Imprimante"
+msgstr "Créer Imprimante"
 
 #: ../web/statuspage.c:123
 msgid "RDONLY     "
@@ -376,15 +376,15 @@ msgstr "Statut du Serveur"
 
 #: ../web/statuspage.c:314
 msgid "Auto Refresh"
-msgstr "Rafra�chissement Automatique"
+msgstr "Rafraîchissement Automatique"
 
 #: ../web/statuspage.c:315 ../web/statuspage.c:320
 msgid "Refresh Interval: "
-msgstr "Intervalle de rafra�chissement: "
+msgstr "Intervalle de rafraîchissement: "
 
 #: ../web/statuspage.c:319
 msgid "Stop Refreshing"
-msgstr "Stopper Rafra�chissement"
+msgstr "Stopper Rafraîchissement"
 
 #: ../web/statuspage.c:334
 msgid "version:"
@@ -534,7 +534,7 @@ msgstr "Options de base"
 
 #: ../param/loadparm.c:775
 msgid "Security Options"
-msgstr "Options de S�curit�"
+msgstr "Options de Sécurité"
 
 #: ../param/loadparm.c:859
 msgid "Logging Options"
@@ -546,7 +546,7 @@ msgstr "Options de Protocole"
 
 #: ../param/loadparm.c:911
 msgid "Tuning Options"
-msgstr "Options de r�glage"
+msgstr "Options de réglage"
 
 #: ../param/loadparm.c:940
 msgid "Printing Options"
diff --git a/source3/po/it.msg b/source3/po/it.msg
index be447a84d4..c52ee65b85 100644
--- a/source3/po/it.msg
+++ b/source3/po/it.msg
@@ -23,7 +23,7 @@ msgstr ""
 "Last-Translator: Simo Sorce <idra@samba.org>\n"
 "Language-Team: (Samba Team) <samba-technical@samba.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: \n"
 
 #: ../web/swat.c:117
diff --git a/source3/po/ja.msg b/source3/po/ja.msg
index affb276414..206351b617 100644
--- a/source3/po/ja.msg
+++ b/source3/po/ja.msg
@@ -24,152 +24,152 @@ msgstr ""
 "Last-Translator: TAKAHASHI Motonobu <monyo@samba.org>\n"
 "Language-Team: Samba Users Group Japan <sugj-tech@samba.gr.jp>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP932\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../web/swat.c:117
 #, c-format
 msgid "ERROR: Can't open %s"
-msgstr "%s ���I�[�v���ł��܂���"
+msgstr "%s をオープンできません"
 
 #: ../web/swat.c:200
 msgid "Help"
-msgstr "�w���v"
+msgstr "ヘルプ"
 
 #: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
 msgid "Set Default"
-msgstr "�f�t�H���g�l"
+msgstr "デフォルト値"
 
 #: ../web/swat.c:408
 #, c-format
 msgid "failed to open %s for writing"
-msgstr "%s ���������ݗp�ɃI�[�v���ł��܂���"
+msgstr "%s を書き込み用にオープンできません"
 
 #: ../web/swat.c:431
 #, c-format
 msgid "Can't reload %s"
-msgstr "%s ���ēǂݍ��݂ł��܂���\n"
+msgstr "%s を再読み込みできません\n"
 
 # msgid "Logged in as <b>%s</b><p>\n"
 #: ../web/swat.c:501
 #, c-format
 msgid "Logged in as <b>%s</b>"
-msgstr "<b>%s</b>�Ƃ��ă��O�C��"
+msgstr "<b>%s</b>としてログイン"
 
 #: ../web/swat.c:505
 msgid "Home"
-msgstr "�z�[��"
+msgstr "ホーム"
 
 #: ../web/swat.c:507
 msgid "Globals"
-msgstr "�O���[�o��"
+msgstr "グローバル"
 
 #: ../web/swat.c:508
 msgid "Shares"
-msgstr "�t�@�C�����L"
+msgstr "ファイル共有"
 
 #: ../web/swat.c:509
 msgid "Printers"
-msgstr "������L"
+msgstr "印刷共有"
 
 #: ../web/swat.c:510
 msgid "Wizard"
-msgstr "�E�B�U�[�h"
+msgstr "ウィザード"
 
 #: ../web/swat.c:513
 msgid "Status"
-msgstr "�T�[�o�̏��"
+msgstr "サーバの状態"
 
 #: ../web/swat.c:514
 msgid "View Config"
-msgstr "���݂̐ݒ�"
+msgstr "現在の設定"
 
 #: ../web/swat.c:516
 msgid "Password Management"
-msgstr "�p�X���[�h�Ǘ�"
+msgstr "パスワード管理"
 
 #: ../web/swat.c:526
 msgid "Current View Is"
-msgstr "���݂̕\�����[�h"
+msgstr "現在の表示モード"
 
 #: ../web/swat.c:527 ../web/swat.c:530
 msgid "Basic"
-msgstr "�W���\��"
+msgstr "標準表示"
 
 #: ../web/swat.c:528 ../web/swat.c:531
 msgid "Advanced"
-msgstr "�ڍו\��"
+msgstr "詳細表示"
 
 #: ../web/swat.c:529
 msgid "Change View To"
-msgstr "�\�����[�h�̕ύX"
+msgstr "表示モードの変更"
 
 #: ../web/swat.c:554
 msgid "Current Config"
-msgstr "���݂̐ݒ�"
+msgstr "現在の設定"
 
 #: ../web/swat.c:558
 msgid "Normal View"
-msgstr "�W���\��"
+msgstr "標準表示"
 
 #: ../web/swat.c:560
 msgid "Full View"
-msgstr "���S�\��"
+msgstr "完全表示"
 
 #. Here we first set and commit all the parameters that were selected
 #. in the previous screen.
 #: ../web/swat.c:579
 msgid "Wizard Parameter Edit Page"
-msgstr "�E�B�U�[�h�ɂ��p�����[�^�ҏW�y�[�W"
+msgstr "ウィザードによるパラメータ編集ページ"
 
 #: ../web/swat.c:608
 msgid "Note: smb.conf file has been read and rewritten"
-msgstr "smb.conf �t�@�C���������������܂����B"
+msgstr "smb.conf ファイルが書き換えられました。"
 
 #. Here we go ...
 #: ../web/swat.c:716
 msgid "Samba Configuration Wizard"
-msgstr "Samba �ݒ�E�B�U�[�h"
+msgstr "Samba 設定ウィザード"
 
 #: ../web/swat.c:720
 msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr "�usmb.conf �̏����v�{�^���������� smb.conf �t�@�C�����̂��ׂẴf�t�H���g�l��R�����g�͍폜����܂��B"
+msgstr "「smb.conf の書換」ボタンを押すと smb.conf ファイル中のすべてのデフォルト値やコメントは削除されます。"
 
 #: ../web/swat.c:721
 msgid "The same will happen if you press the commit button."
-msgstr "�ucommit�v�{�^�����������ꍇ�ɂ����l�̕ύX���s�Ȃ��܂��B"
+msgstr "「commit」ボタンを押した場合にも同様の変更が行なわれます。"
 
 #: ../web/swat.c:724
 msgid "Rewrite smb.conf file"
-msgstr "smb.conf �̏���"
+msgstr "smb.conf の書換"
 
 #: ../web/swat.c:725
 msgid "Commit"
-msgstr "�ݒ�𔽉f"
+msgstr "設定を反映"
 
 #: ../web/swat.c:726
 msgid "Edit Parameter Values"
-msgstr "�e�p�����[�^�̕ҏW"
+msgstr "各パラメータの編集"
 
 #: ../web/swat.c:732
 msgid "Server Type"
-msgstr "�T�[�o�^�C�v"
+msgstr "サーバタイプ"
 
 #: ../web/swat.c:733
 msgid "Stand Alone"
-msgstr "�X�^���h�A����"
+msgstr "スタンドアロン"
 
 #: ../web/swat.c:734
 msgid "Domain Member"
-msgstr "�h���C�������o"
+msgstr "ドメインメンバ"
 
 #: ../web/swat.c:735
 msgid "Domain Controller"
-msgstr "�h���C���R���g���[��"
+msgstr "ドメインコントローラ"
 
 #: ../web/swat.c:738
 msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr "�ʏ�̌`���ł͂Ȃ� - �V�������[�h��I���̂���"
+msgstr "通常の形式ではない - 新しいモードを選択のこと"
 
 #: ../web/swat.c:740
 msgid "Configure WINS As"
@@ -177,220 +177,220 @@ msgstr "WINS"
 
 #: ../web/swat.c:741
 msgid "Not Used"
-msgstr "�g��Ȃ�"
+msgstr "使わない"
 
 #: ../web/swat.c:742
 msgid "Server for client use"
-msgstr "�T�[�o�Ƃ��č\��"
+msgstr "サーバとして構成"
 
 #: ../web/swat.c:743
 msgid "Client of another WINS server"
-msgstr "�ʂ� WINS �T�[�o�̃N���C�A���g�Ƃ��č\��"
+msgstr "別の WINS サーバのクライアントとして構成"
 
 #: ../web/swat.c:745
 msgid "Remote WINS Server"
-msgstr "�ʂ� WINS �T�[�o"
+msgstr "別の WINS サーバ"
 
 #: ../web/swat.c:756
 msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr "�G���[: wins server �� wins support �̗��p�����[�^�� smb.conf �Ŏw�肳��Ă��܂�"
+msgstr "エラー: wins server と wins support の両パラメータが smb.conf で指定されています"
 
 #: ../web/swat.c:757
 msgid "Please Select desired WINS mode above."
-msgstr "�����ꂩ�� WINS ���[�h��I�����Ă��������B"
+msgstr "いずれかの WINS モードを選択してください。"
 
 #: ../web/swat.c:759
 msgid "Expose Home Directories"
-msgstr "�z�[���f�B���N�g���̌��J"
+msgstr "ホームディレクトリの公開"
 
 #: ../web/swat.c:774
 msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr "��L�̐ݒ�I�v�V�����ɂ��A�����̃p�����[�^���������Đݒ肳��邽�߁A Samba �̉^�p��v���ɊJ�n�����ł̏����ƂȂ�ł��傤�B"
+msgstr "上記の設定オプションにより、複数のパラメータが同期して設定されるため、 Samba の運用を迅速に開始する上での助けとなるでしょう。"
 
 #: ../web/swat.c:787
 msgid "Global Parameters"
-msgstr "Global �p�����[�^"
+msgstr "Global パラメータ"
 
 #: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
 msgid "Commit Changes"
-msgstr "�ύX�𔽉f"
+msgstr "変更を反映"
 
 #: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
 msgid "Reset Values"
-msgstr "�ύX�����"
+msgstr "変更を取消"
 
 #: ../web/swat.c:844
 msgid "Share Parameters"
-msgstr "�t�@�C�����L �p�����[�^"
+msgstr "ファイル共有 パラメータ"
 
 #: ../web/swat.c:887
 msgid "Choose Share"
-msgstr "�t�@�C�����L�̑I��"
+msgstr "ファイル共有の選択"
 
 #: ../web/swat.c:901
 msgid "Delete Share"
-msgstr "�t�@�C�����L�̍폜"
+msgstr "ファイル共有の削除"
 
 #: ../web/swat.c:908
 msgid "Create Share"
-msgstr "�t�@�C�����L�̍쐬"
+msgstr "ファイル共有の作成"
 
 #: ../web/swat.c:944
 msgid "password change in demo mode rejected"
-msgstr "�f���E���[�h�ł̃p�X���[�h�ύX�͂ł��܂���"
+msgstr "デモ・モードでのパスワード変更はできません"
 
 #: ../web/swat.c:957
 msgid "Can't setup password database vectors."
-msgstr "�p�X���[�h�E�f�[�^�x�[�X�����‚����܂���"
+msgstr "パスワード・データベースが見つけられません"
 
 #: ../web/swat.c:983
 msgid " Must specify \"User Name\" "
-msgstr "�u���[�U���v���ɓ��͂��Ă�������"
+msgstr "「ユーザ名」欄に入力してください"
 
 #: ../web/swat.c:999
 msgid " Must specify \"Old Password\" "
-msgstr "�u���p�X���[�h�v���ɓ��͂��Ă�������"
+msgstr "「旧パスワード」欄に入力してください"
 
 #: ../web/swat.c:1005
 msgid " Must specify \"Remote Machine\" "
-msgstr "�u�����[�g�}�V���v���ɓ��͂��Ă�������"
+msgstr "「リモートマシン」欄に入力してください"
 
 #: ../web/swat.c:1012
 msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr "�u�V�p�X���[�h�v���Ɓu�V�p�X���[�h�̍ē��́v���ɓ��͂��Ă�������"
+msgstr "「新パスワード」欄と「新パスワードの再入力」欄に入力してください"
 
 #: ../web/swat.c:1018
 msgid " Re-typed password didn't match new password "
-msgstr "�u�V�p�X���[�h�̍ē��́v���̓��͓��e���u�V�p�X���[�h�v���̓��͂ƈ�v���Ă��܂���B"
+msgstr "「新パスワードの再入力」欄の入力内容が「新パスワード」欄の入力と一致していません。"
 
 #: ../web/swat.c:1048
 #, c-format
 msgid " The passwd for '%s' has been changed."
-msgstr " %s �̃p�X���[�h�͕ύX����܂����B"
+msgstr " %s のパスワードは変更されました。"
 
 #: ../web/swat.c:1051
 #, c-format
 msgid " The passwd for '%s' has NOT been changed."
-msgstr " '%s' �̃p�X���[�h�͕ύX����܂���ł����B"
+msgstr " '%s' のパスワードは変更されませんでした。"
 
 #: ../web/swat.c:1076
 msgid "Server Password Management"
-msgstr "���[�J���}�V���̃p�X���[�h�Ǘ�"
+msgstr "ローカルマシンのパスワード管理"
 
 #.
 #. * Create all the dialog boxes for data collection
 #.
 #: ../web/swat.c:1085 ../web/swat.c:1132
 msgid "User Name"
-msgstr "���[�U��"
+msgstr "ユーザ名"
 
 #: ../web/swat.c:1088 ../web/swat.c:1134
 msgid "Old Password"
-msgstr "���p�X���[�h"
+msgstr "旧パスワード"
 
 #: ../web/swat.c:1091 ../web/swat.c:1136
 msgid "New Password"
-msgstr "�V�p�X���[�h"
+msgstr "新パスワード"
 
 #: ../web/swat.c:1093 ../web/swat.c:1138
 msgid "Re-type New Password"
-msgstr "�V�p�X���[�h�̍ē���"
+msgstr "新パスワードの再入力"
 
 #: ../web/swat.c:1101 ../web/swat.c:1149
 msgid "Change Password"
-msgstr "�p�X���[�h�ύX"
+msgstr "パスワード変更"
 
 #: ../web/swat.c:1104
 msgid "Add New User"
-msgstr "�V�K���[�U�lj�"
+msgstr "新規ユーザ追加"
 
 #: ../web/swat.c:1106
 msgid "Delete User"
-msgstr "���[�U�̍폜"
+msgstr "ユーザの削除"
 
 #: ../web/swat.c:1108
 msgid "Disable User"
-msgstr "���[�U�̖�����"
+msgstr "ユーザの無効化"
 
 #: ../web/swat.c:1110
 msgid "Enable User"
-msgstr "���[�U�̗L����"
+msgstr "ユーザの有効化"
 
 #: ../web/swat.c:1123
 msgid "Client/Server Password Management"
-msgstr "�����[�g�}�V���̃p�X���[�h�Ǘ�"
+msgstr "リモートマシンのパスワード管理"
 
 #: ../web/swat.c:1140
 msgid "Remote Machine"
-msgstr "�����[�g�}�V��"
+msgstr "リモートマシン"
 
 #: ../web/swat.c:1179
 msgid "Printer Parameters"
-msgstr "������L �p�����[�^"
+msgstr "印刷共有 パラメータ"
 
 #: ../web/swat.c:1181
 msgid "Important Note:"
-msgstr "*��"
+msgstr "*注"
 
 #: ../web/swat.c:1182
 msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "���O�̐擪�� [*] ���‚����v�����^"
+msgstr "名前の先頭に [*] がついたプリンタ"
 
 #: ../web/swat.c:1183
 msgid "are autoloaded printers from "
-msgstr "��"
+msgstr "は"
 
 #: ../web/swat.c:1184
 msgid "Printcap Name"
-msgstr "printcap name �p�����[�^"
+msgstr "printcap name パラメータ"
 
 #: ../web/swat.c:1185
 msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "���玩���ݒ肳�ꂽ���̂ł�����A�폜���邱�Ƃ͂ł��܂���B"
+msgstr "から自動設定されたものですから、削除することはできません。"
 
 #: ../web/swat.c:1231
 msgid "Choose Printer"
-msgstr "������L�̑I��"
+msgstr "印刷共有の選択"
 
 #: ../web/swat.c:1250
 msgid "Delete Printer"
-msgstr "������L�̍폜"
+msgstr "印刷共有の削除"
 
 #: ../web/swat.c:1257
 msgid "Create Printer"
-msgstr "������L�̍쐬"
+msgstr "印刷共有の作成"
 
 #: ../web/statuspage.c:123
 msgid "RDONLY     "
-msgstr "�Q�Ƃ̂�   "
+msgstr "参照のみ   "
 
 #: ../web/statuspage.c:124
 msgid "WRONLY     "
-msgstr "�X�V�̂�   "
+msgstr "更新のみ   "
 
 #: ../web/statuspage.c:125
 msgid "RDWR       "
-msgstr "�Q��/�X�V  "
+msgstr "参照/更新  "
 
 #: ../web/statuspage.c:309
 msgid "Server Status"
-msgstr "�T�[�o�̏��"
+msgstr "サーバの状態"
 
 #: ../web/statuspage.c:314
 msgid "Auto Refresh"
-msgstr "�����X�V�̊J�n"
+msgstr "自動更新の開始"
 
 #: ../web/statuspage.c:315 ../web/statuspage.c:320
 msgid "Refresh Interval: "
-msgstr "�X�V�Ԋu: "
+msgstr "更新間隔: "
 
 #: ../web/statuspage.c:319
 msgid "Stop Refreshing"
-msgstr "�����X�V�̒�~"
+msgstr "自動更新の停止"
 
 #: ../web/statuspage.c:334
 msgid "version:"
-msgstr "�o�[�W����"
+msgstr "バージョン"
 
 #: ../web/statuspage.c:337
 msgid "smbd:"
@@ -398,23 +398,23 @@ msgstr ""
 
 #: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
 msgid "running"
-msgstr "���s��"
+msgstr "実行中"
 
 #: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
 msgid "not running"
-msgstr "��~��"
+msgstr "停止中"
 
 #: ../web/statuspage.c:341
 msgid "Stop smbd"
-msgstr "smbd �̒�~"
+msgstr "smbd の停止"
 
 #: ../web/statuspage.c:343
 msgid "Start smbd"
-msgstr "smbd �̋N��"
+msgstr "smbd の起動"
 
 #: ../web/statuspage.c:345
 msgid "Restart smbd"
-msgstr "smbd �̍ċN��"
+msgstr "smbd の再起動"
 
 #: ../web/statuspage.c:350
 msgid "nmbd:"
@@ -422,15 +422,15 @@ msgstr ""
 
 #: ../web/statuspage.c:354
 msgid "Stop nmbd"
-msgstr "nmbd �̒�~"
+msgstr "nmbd の停止"
 
 #: ../web/statuspage.c:356
 msgid "Start nmbd"
-msgstr "nmbd �̋N��"
+msgstr "nmbd の起動"
 
 #: ../web/statuspage.c:358
 msgid "Restart nmbd"
-msgstr "nmbd �̍ċN��"
+msgstr "nmbd の再起動"
 
 #: ../web/statuspage.c:364
 msgid "winbindd:"
@@ -438,33 +438,33 @@ msgstr ""
 
 #: ../web/statuspage.c:368
 msgid "Stop winbindd"
-msgstr "winbindd �̒�~"
+msgstr "winbindd の停止"
 
 #: ../web/statuspage.c:370
 msgid "Start winbindd"
-msgstr "winbindd �̋N��"
+msgstr "winbindd の起動"
 
 #: ../web/statuspage.c:372
 msgid "Restart winbindd"
-msgstr "winbindd �̍ċN��"
+msgstr "winbindd の再起動"
 
 #. stop, restart all
 #: ../web/statuspage.c:381
 msgid "Stop All"
-msgstr "���ׂĒ�~"
+msgstr "すべて停止"
 
 #: ../web/statuspage.c:382
 msgid "Restart All"
-msgstr "���ׂčċN��"
+msgstr "すべて再起動"
 
 #. start all
 #: ../web/statuspage.c:386
 msgid "Start All"
-msgstr "���ׂċN��"
+msgstr "すべて起動"
 
 #: ../web/statuspage.c:393
 msgid "Active Connections"
-msgstr "�ڑ����̃N���C�A���g"
+msgstr "接続中のクライアント"
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
 msgid "PID"
@@ -472,47 +472,47 @@ msgstr ""
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408
 msgid "Client"
-msgstr "�N���C�A���g"
+msgstr "クライアント"
 
 #: ../web/statuspage.c:395
 msgid "IP address"
-msgstr "IP�A�h���X"
+msgstr "IPアドレス"
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
 msgid "Date"
-msgstr "���t"
+msgstr "日付"
 
 #: ../web/statuspage.c:397
 msgid "Kill"
-msgstr "�ؒf"
+msgstr "切断"
 
 #: ../web/statuspage.c:405
 msgid "Active Shares"
-msgstr "�ڑ����̋��L"
+msgstr "接続中の共有"
 
 #: ../web/statuspage.c:408
 msgid "Share"
-msgstr "���L��"
+msgstr "共有名"
 
 #: ../web/statuspage.c:408
 msgid "User"
-msgstr "���[�U"
+msgstr "ユーザ"
 
 #: ../web/statuspage.c:408
 msgid "Group"
-msgstr "�O���[�v"
+msgstr "グループ"
 
 #: ../web/statuspage.c:414
 msgid "Open Files"
-msgstr "�g�p���̃t�@�C��"
+msgstr "使用中のファイル"
 
 #: ../web/statuspage.c:416
 msgid "Sharing"
-msgstr "�r�����[�h"
+msgstr "排他モード"
 
 #: ../web/statuspage.c:416
 msgid "R/W"
-msgstr "�Q��/�X�V"
+msgstr "参照/更新"
 
 #: ../web/statuspage.c:416
 msgid "Oplock"
@@ -520,76 +520,76 @@ msgstr ""
 
 #: ../web/statuspage.c:416
 msgid "File"
-msgstr "�t�@�C����"
+msgstr "ファイル名"
 
 #: ../web/statuspage.c:425
 msgid "Show Client in col 1"
-msgstr "�N���C�A���g����擪�ɕ\��"
+msgstr "クライアント名を先頭に表示"
 
 #: ../web/statuspage.c:426
 msgid "Show PID in col 1"
-msgstr "PID��擪�ɕ\��"
+msgstr "PIDを先頭に表示"
 
 #: ../param/loadparm.c:755
 msgid "Base Options"
-msgstr "��{ �I�v�V����"
+msgstr "基本 オプション"
 
 #: ../param/loadparm.c:775
 msgid "Security Options"
-msgstr "�Z�L�����e�B �I�v�V����"
+msgstr "セキュリティ オプション"
 
 #: ../param/loadparm.c:859
 msgid "Logging Options"
-msgstr "���M���O �I�v�V����"
+msgstr "ロギング オプション"
 
 #: ../param/loadparm.c:874
 msgid "Protocol Options"
-msgstr "�v���g�R�� �I�v�V����"
+msgstr "プロトコル オプション"
 
 #: ../param/loadparm.c:911
 msgid "Tuning Options"
-msgstr "�`���[�j���O �I�v�V����"
+msgstr "チューニング オプション"
 
 #: ../param/loadparm.c:940
 msgid "Printing Options"
-msgstr "��� �I�v�V����"
+msgstr "印刷 オプション"
 
 #: ../param/loadparm.c:970
 msgid "Filename Handling"
-msgstr "�t�@�C�����̎戵"
+msgstr "ファイル名の取扱"
 
 #: ../param/loadparm.c:996
 msgid "Domain Options"
-msgstr "�h���C�� �I�v�V����"
+msgstr "ドメイン オプション"
 
 #: ../param/loadparm.c:1000
 msgid "Logon Options"
-msgstr "���O�I�� �I�v�V����"
+msgstr "ログオン オプション"
 
 #: ../param/loadparm.c:1019
 msgid "Browse Options"
-msgstr "�u���E�W���O �I�v�V����"
+msgstr "ブラウジング オプション"
 
 #: ../param/loadparm.c:1033
 msgid "WINS Options"
-msgstr "WINS �I�v�V����"
+msgstr "WINS オプション"
 
 #: ../param/loadparm.c:1043
 msgid "Locking Options"
-msgstr "���b�L���O �I�v�V����"
+msgstr "ロッキング オプション"
 
 #: ../param/loadparm.c:1061
 msgid "Ldap Options"
-msgstr "LDAP �I�v�V����"
+msgstr "LDAP オプション"
 
 #: ../param/loadparm.c:1078
 msgid "Miscellaneous Options"
-msgstr "���̑��̃I�v�V����"
+msgstr "その他のオプション"
 
 #: ../param/loadparm.c:1138
 msgid "VFS module options"
-msgstr "VFS �I�v�V����"
+msgstr "VFS オプション"
 
 #: ../param/loadparm.c:1148
 msgid "Winbind options"
-msgstr "Winbind �I�v�V����"
+msgstr "Winbind オプション"
diff --git a/source3/po/nl.msg b/source3/po/nl.msg
index 8d7b050ce9..b9f64234d6 100644
--- a/source3/po/nl.msg
+++ b/source3/po/nl.msg
@@ -23,7 +23,7 @@ msgstr ""
 "Last-Translator: Jelmer Vernooij <jelmer@samba.org>\n"
 "Language-Team: (Samba Team) <samba-technical@samba.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=US-ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 
 #: ../web/swat.c:117
diff --git a/source3/po/pl.msg b/source3/po/pl.msg
index a7e56453bf..6bc98f99d6 100644
--- a/source3/po/pl.msg
+++ b/source3/po/pl.msg
@@ -23,7 +23,7 @@ msgstr ""
 "Last-Translator: Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>\n"
 "Language-Team: pl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 
 #: ../web/swat.c:117
@@ -37,7 +37,7 @@ msgstr "Pomoc"
 
 #: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
 msgid "Set Default"
-msgstr "Ustaw domy�lnie"
+msgstr "Ustaw domyślnie"
 
 #: ../web/swat.c:408
 #, c-format
@@ -64,7 +64,7 @@ msgstr "Ustawienia globalne"
 
 #: ../web/swat.c:508
 msgid "Shares"
-msgstr "Wsp�udzia�y"
+msgstr "Współudziały"
 
 #: ../web/swat.c:509
 msgid "Printers"
@@ -80,15 +80,15 @@ msgstr "Status"
 
 #: ../web/swat.c:514
 msgid "View Config"
-msgstr "Przejrzyj Konfiguracj�"
+msgstr "Przejrzyj Konfigurację"
 
 #: ../web/swat.c:516
 msgid "Password Management"
-msgstr "Zarz�dzanie Has�ami"
+msgstr "Zarządzanie Hasłami"
 
 #: ../web/swat.c:526
 msgid "Current View Is"
-msgstr "Bie��ca Konfiguracja"
+msgstr "Bieżąca Konfiguracja"
 
 #: ../web/swat.c:527 ../web/swat.c:530
 msgid "Basic"
@@ -100,11 +100,11 @@ msgstr "Widok Zaawansowany"
 
 #: ../web/swat.c:529
 msgid "Change View To"
-msgstr "Zmie� Has�o"
+msgstr "Zmień Hasło"
 
 #: ../web/swat.c:554
 msgid "Current Config"
-msgstr "Bie��ca Konfiguracja"
+msgstr "Bieżąca Konfiguracja"
 
 #: ../web/swat.c:558
 msgid "Normal View"
@@ -112,7 +112,7 @@ msgstr "Normalny Widok"
 
 #: ../web/swat.c:560
 msgid "Full View"
-msgstr "Pe�ny Widok"
+msgstr "Pełny Widok"
 
 #. Here we first set and commit all the parameters that were selected
 #. in the previous screen.
@@ -143,7 +143,7 @@ msgstr ""
 
 #: ../web/swat.c:725
 msgid "Commit"
-msgstr "Potwierd� Zmiany"
+msgstr "Potwierdź Zmiany"
 
 #: ../web/swat.c:726
 msgid "Edit Parameter Values"
@@ -211,31 +211,31 @@ msgstr "Zmienne Globalne"
 
 #: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
 msgid "Commit Changes"
-msgstr "Potwierd� Zmiany"
+msgstr "Potwierdź Zmiany"
 
 #: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
 msgid "Reset Values"
-msgstr "Zresetuj Warto�ci"
+msgstr "Zresetuj Wartości"
 
 #: ../web/swat.c:844
 msgid "Share Parameters"
-msgstr "Parametry Wsp�udzia�u"
+msgstr "Parametry Współudziału"
 
 #: ../web/swat.c:887
 msgid "Choose Share"
-msgstr "Wybierz Wsp�udzia�"
+msgstr "Wybierz Współudział"
 
 #: ../web/swat.c:901
 msgid "Delete Share"
-msgstr "Usu� Wsp�udzia�"
+msgstr "Usuń Współudział"
 
 #: ../web/swat.c:908
 msgid "Create Share"
-msgstr "Utw�rz Wsp�udzia�"
+msgstr "Utwórz Współudział"
 
 #: ../web/swat.c:944
 msgid "password change in demo mode rejected"
-msgstr "zmiana has�a w trybie demo odrzucona\n"
+msgstr "zmiana hasła w trybie demo odrzucona\n"
 
 #: ../web/swat.c:957
 msgid "Can't setup password database vectors."
@@ -243,80 +243,80 @@ msgstr ""
 
 #: ../web/swat.c:983
 msgid " Must specify \"User Name\" "
-msgstr " Musisz poda� \"Nazw� U�ytkownika\" \n"
+msgstr " Musisz podać \"Nazwę Użytkownika\" \n"
 
 #: ../web/swat.c:999
 msgid " Must specify \"Old Password\" "
-msgstr " Musisz poda� \"Stare Has�o\" \n"
+msgstr " Musisz podać \"Stare Hasło\" \n"
 
 #: ../web/swat.c:1005
 msgid " Must specify \"Remote Machine\" "
-msgstr " Musisz poda� \"Zdaln� Maszyn�\" \n"
+msgstr " Musisz podać \"Zdalną Maszynę\" \n"
 
 #: ../web/swat.c:1012
 msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " Musisz poda� \"Nowe Has�o, i ponownie wpisane Nowe Has�o\" \n"
+msgstr " Musisz podać \"Nowe Hasło, i ponownie wpisane Nowe Hasło\" \n"
 
 #: ../web/swat.c:1018
 msgid " Re-typed password didn't match new password "
-msgstr " Ponownie wpisane has�o nie pasuje do nowego has�a\n"
+msgstr " Ponownie wpisane hasło nie pasuje do nowego hasła\n"
 
 #: ../web/swat.c:1048
 #, c-format
 msgid " The passwd for '%s' has been changed."
-msgstr " Has�o dla '%s' zosta�o zmienione. \n"
+msgstr " Hasło dla '%s' zostało zmienione. \n"
 
 #: ../web/swat.c:1051
 #, c-format
 msgid " The passwd for '%s' has NOT been changed."
-msgstr " Has�o dla '%s' NIE zosta�o zmienione. \n"
+msgstr " Hasło dla '%s' NIE zostało zmienione. \n"
 
 #: ../web/swat.c:1076
 msgid "Server Password Management"
-msgstr "Zarz�dzanie Has�ami na Serwerze"
+msgstr "Zarządzanie Hasłami na Serwerze"
 
 #.
 #. * Create all the dialog boxes for data collection
 #.
 #: ../web/swat.c:1085 ../web/swat.c:1132
 msgid "User Name"
-msgstr " Nazwa U�ytkownika"
+msgstr " Nazwa Użytkownika"
 
 #: ../web/swat.c:1088 ../web/swat.c:1134
 msgid "Old Password"
-msgstr " Stare Has�o"
+msgstr " Stare Hasło"
 
 #: ../web/swat.c:1091 ../web/swat.c:1136
 msgid "New Password"
-msgstr " Nowe Has�o"
+msgstr " Nowe Hasło"
 
 #: ../web/swat.c:1093 ../web/swat.c:1138
 msgid "Re-type New Password"
-msgstr " Ponownie wpisz Nowe Has�o"
+msgstr " Ponownie wpisz Nowe Hasło"
 
 #: ../web/swat.c:1101 ../web/swat.c:1149
 msgid "Change Password"
-msgstr "Zmie� Has�o"
+msgstr "Zmień Hasło"
 
 #: ../web/swat.c:1104
 msgid "Add New User"
-msgstr "Dodaj Nowego U�ytkownika"
+msgstr "Dodaj Nowego Użytkownika"
 
 #: ../web/swat.c:1106
 msgid "Delete User"
-msgstr "Usu� U�ytkownika"
+msgstr "Usuń Użytkownika"
 
 #: ../web/swat.c:1108
 msgid "Disable User"
-msgstr "Zablokuj U�ytkownika"
+msgstr "Zablokuj Użytkownika"
 
 #: ../web/swat.c:1110
 msgid "Enable User"
-msgstr "Odblokuj U�ytkownika"
+msgstr "Odblokuj Użytkownika"
 
 #: ../web/swat.c:1123
 msgid "Client/Server Password Management"
-msgstr "Zarz�dzanie Has�ami Klient/Serwer"
+msgstr "Zarządzanie Hasłami Klient/Serwer"
 
 #: ../web/swat.c:1140
 msgid "Remote Machine"
@@ -328,15 +328,15 @@ msgstr "Parametry Drukarki"
 
 #: ../web/swat.c:1181
 msgid "Important Note:"
-msgstr "Wa�na Informacja:"
+msgstr "Ważna Informacja:"
 
 #: ../web/swat.c:1182
 msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Nazwy Drukarek zaznaczone [*] w rozwijanym polu Wybierz Drukark� "
+msgstr "Nazwy Drukarek zaznaczone [*] w rozwijanym polu Wybierz Drukarkę "
 
 #: ../web/swat.c:1183
 msgid "are autoloaded printers from "
-msgstr "s� drukarkami automatycznie �adowanymi z "
+msgstr "są drukarkami automatycznie ładowanymi z "
 
 #: ../web/swat.c:1184
 msgid "Printcap Name"
@@ -344,19 +344,19 @@ msgstr "Nazwa Printcap"
 
 #: ../web/swat.c:1185
 msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Pr�by usuni�cia tych drukarek ze SWAT nie przynios� efektu.\n"
+msgstr "Próby usunięcia tych drukarek ze SWAT nie przyniosą efektu.\n"
 
 #: ../web/swat.c:1231
 msgid "Choose Printer"
-msgstr "Wybierz Drukark�"
+msgstr "Wybierz Drukarkę"
 
 #: ../web/swat.c:1250
 msgid "Delete Printer"
-msgstr "Usu� Drukark�"
+msgstr "Usuń Drukarkę"
 
 #: ../web/swat.c:1257
 msgid "Create Printer"
-msgstr "Utw�rz Drukark�"
+msgstr "Utwórz Drukarkę"
 
 #: ../web/statuspage.c:123
 msgid "RDONLY     "
@@ -376,15 +376,15 @@ msgstr "Status Serwera"
 
 #: ../web/statuspage.c:314
 msgid "Auto Refresh"
-msgstr "Automatyczne Od�wie�anie"
+msgstr "Automatyczne Odświeżanie"
 
 #: ../web/statuspage.c:315 ../web/statuspage.c:320
 msgid "Refresh Interval: "
-msgstr "Interwa� Od�wie�ania: "
+msgstr "Interwał Odświeżania: "
 
 #: ../web/statuspage.c:319
 msgid "Stop Refreshing"
-msgstr "Zatrzymaj Od�wie�anie"
+msgstr "Zatrzymaj Odświeżanie"
 
 #: ../web/statuspage.c:334
 msgid "version:"
@@ -396,11 +396,11 @@ msgstr ""
 
 #: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
 msgid "running"
-msgstr "dzia�a"
+msgstr "działa"
 
 #: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
 msgid "not running"
-msgstr "nie dzia�a"
+msgstr "nie działa"
 
 #: ../web/statuspage.c:341
 msgid "Stop smbd"
@@ -462,7 +462,7 @@ msgstr "Uruchom nmbd"
 
 #: ../web/statuspage.c:393
 msgid "Active Connections"
-msgstr "Aktywne Po��czenia"
+msgstr "Aktywne Połączenia"
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
 msgid "PID"
@@ -486,15 +486,15 @@ msgstr "Zatrzymaj"
 
 #: ../web/statuspage.c:405
 msgid "Active Shares"
-msgstr "Aktywne Wsp�udzia�y"
+msgstr "Aktywne Współudziały"
 
 #: ../web/statuspage.c:408
 msgid "Share"
-msgstr "Wsp�udzia�"
+msgstr "Współudział"
 
 #: ../web/statuspage.c:408
 msgid "User"
-msgstr "U�ytkownik"
+msgstr "Użytkownik"
 
 #: ../web/statuspage.c:408
 msgid "Group"
@@ -506,7 +506,7 @@ msgstr "Otwarte Pliki"
 
 #: ../web/statuspage.c:416
 msgid "Sharing"
-msgstr "Wsp�dzielenie"
+msgstr "Współdzielenie"
 
 #: ../web/statuspage.c:416
 msgid "R/W"
@@ -534,7 +534,7 @@ msgstr "Bazowe Opcje"
 
 #: ../param/loadparm.c:775
 msgid "Security Options"
-msgstr "Opcje Zabezpiecze�"
+msgstr "Opcje Zabezpieczeń"
 
 #: ../param/loadparm.c:859
 msgid "Logging Options"
@@ -542,11 +542,11 @@ msgstr "Opcje Blokowania"
 
 #: ../param/loadparm.c:874
 msgid "Protocol Options"
-msgstr "Opcje Protoko�u"
+msgstr "Opcje Protokołu"
 
 #: ../param/loadparm.c:911
 msgid "Tuning Options"
-msgstr "Opcje Dostrajaj�ce"
+msgstr "Opcje Dostrajające"
 
 #: ../param/loadparm.c:940
 msgid "Printing Options"
@@ -554,7 +554,7 @@ msgstr "Opcje Drukowania"
 
 #: ../param/loadparm.c:970
 msgid "Filename Handling"
-msgstr "Obs�uga Nazw Plik�w"
+msgstr "Obsługa Nazw Plików"
 
 #: ../param/loadparm.c:996
 msgid "Domain Options"
@@ -566,7 +566,7 @@ msgstr "Opcje Logowania"
 
 #: ../param/loadparm.c:1019
 msgid "Browse Options"
-msgstr "Opcje Przegl�dania"
+msgstr "Opcje Przeglądania"
 
 #: ../param/loadparm.c:1033
 msgid "WINS Options"
@@ -582,7 +582,7 @@ msgstr "Opcje Ldap"
 
 #: ../param/loadparm.c:1078
 msgid "Miscellaneous Options"
-msgstr "Pozosta�e Opcje"
+msgstr "Pozostałe Opcje"
 
 #: ../param/loadparm.c:1138
 msgid "VFS module options"
diff --git a/source3/po/tr.msg b/source3/po/tr.msg
index 8ef551da46..2170d8bdf9 100644
--- a/source3/po/tr.msg
+++ b/source3/po/tr.msg
@@ -23,7 +23,7 @@ msgstr ""
 "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.1\n"
 
@@ -34,11 +34,11 @@ msgstr ""
 
 #: ../web/swat.c:200
 msgid "Help"
-msgstr "Yard�m"
+msgstr "Yardım"
 
 #: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
 msgid "Set Default"
-msgstr "�ntan�ml�ya Ayarla"
+msgstr "Öntanımlıya Ayarla"
 
 #: ../web/swat.c:408
 #, c-format
@@ -53,7 +53,7 @@ msgstr ""
 #: ../web/swat.c:501
 #, c-format
 msgid "Logged in as <b>%s</b>"
-msgstr "<b>%s</b> kimli�i ile oturum a��lm��"
+msgstr "<b>%s</b> kimliği ile oturum açılmış"
 
 #: ../web/swat.c:505
 msgid "Home"
@@ -65,11 +65,11 @@ msgstr "Evrenseller"
 
 #: ../web/swat.c:508
 msgid "Shares"
-msgstr "Payla��mlar"
+msgstr "Paylaşımlar"
 
 #: ../web/swat.c:509
 msgid "Printers"
-msgstr "Yaz�c�lar"
+msgstr "Yazıcılar"
 
 #: ../web/swat.c:510
 msgid "Wizard"
@@ -81,39 +81,39 @@ msgstr "Durum"
 
 #: ../web/swat.c:514
 msgid "View Config"
-msgstr "Ayarlara G�zat"
+msgstr "Ayarlara Gözat"
 
 #: ../web/swat.c:516
 msgid "Password Management"
-msgstr "�ifre Y�netimi"
+msgstr "Şifre Yönetimi"
 
 #: ../web/swat.c:526
 msgid "Current View Is"
-msgstr "�imdiki Ayarlar"
+msgstr "Şimdiki Ayarlar"
 
 #: ../web/swat.c:527 ../web/swat.c:530
 msgid "Basic"
-msgstr "Temel G�r�n�m"
+msgstr "Temel Görünüm"
 
 #: ../web/swat.c:528 ../web/swat.c:531
 msgid "Advanced"
-msgstr "Geli�mi� G�r�n�m"
+msgstr "Gelişmiş Görünüm"
 
 #: ../web/swat.c:529
 msgid "Change View To"
-msgstr "�ifre De�i�tir"
+msgstr "Şifre Değiştir"
 
 #: ../web/swat.c:554
 msgid "Current Config"
-msgstr "�imdiki Ayarlar"
+msgstr "Şimdiki Ayarlar"
 
 #: ../web/swat.c:558
 msgid "Normal View"
-msgstr "Normal G�r�n�m"
+msgstr "Normal Görünüm"
 
 #: ../web/swat.c:560
 msgid "Full View"
-msgstr "Tam G�r�n�m"
+msgstr "Tam Görünüm"
 
 #. Here we first set and commit all the parameters that were selected
 #. in the previous screen.
@@ -144,11 +144,11 @@ msgstr ""
 
 #: ../web/swat.c:725
 msgid "Commit"
-msgstr "a��klama"
+msgstr "açıklama"
 
 #: ../web/swat.c:726
 msgid "Edit Parameter Values"
-msgstr "Yaz�c� Bilgileri"
+msgstr "Yazıcı Bilgileri"
 
 #: ../web/swat.c:732
 msgid "Server Type"
@@ -156,7 +156,7 @@ msgstr ""
 
 #: ../web/swat.c:733
 msgid "Stand Alone"
-msgstr "Nmbd'yi �al��t�r"
+msgstr "Nmbd'yi çalıştır"
 
 #: ../web/swat.c:734
 msgid "Domain Member"
@@ -208,35 +208,35 @@ msgstr ""
 
 #: ../web/swat.c:787
 msgid "Global Parameters"
-msgstr "Genel De�i�kenler"
+msgstr "Genel Değişkenler"
 
 #: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
 msgid "Commit Changes"
-msgstr "De�i�iklikleri Kaydet"
+msgstr "Değişiklikleri Kaydet"
 
 #: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
 msgid "Reset Values"
-msgstr "De�erleri �lk Haline Getir"
+msgstr "Değerleri İlk Haline Getir"
 
 #: ../web/swat.c:844
 msgid "Share Parameters"
-msgstr "Payla��m Parametreleri"
+msgstr "Paylaşım Parametreleri"
 
 #: ../web/swat.c:887
 msgid "Choose Share"
-msgstr "Payla��m Se�in"
+msgstr "Paylaşım Seçin"
 
 #: ../web/swat.c:901
 msgid "Delete Share"
-msgstr "Payla��m Kald�r"
+msgstr "Paylaşım Kaldır"
 
 #: ../web/swat.c:908
 msgid "Create Share"
-msgstr "Payla��m Olu�tur"
+msgstr "Paylaşım Oluştur"
 
 #: ../web/swat.c:944
 msgid "password change in demo mode rejected"
-msgstr "demo kipinde �ifre de�i�ikli�i kabul edilmedi\n"
+msgstr "demo kipinde şifre değişikliği kabul edilmedi\n"
 
 #: ../web/swat.c:957
 msgid "Can't setup password database vectors."
@@ -244,11 +244,11 @@ msgstr ""
 
 #: ../web/swat.c:983
 msgid " Must specify \"User Name\" "
-msgstr " \"Kullan�c� Ad�\" belirtilmeli \n"
+msgstr " \"Kullanıcı Adı\" belirtilmeli \n"
 
 #: ../web/swat.c:999
 msgid " Must specify \"Old Password\" "
-msgstr " \"Eski �ifre\" belirtilmeli \n"
+msgstr " \"Eski Şifre\" belirtilmeli \n"
 
 #: ../web/swat.c:1005
 msgid " Must specify \"Remote Machine\" "
@@ -256,48 +256,48 @@ msgstr " \"Uzak Makina\" belirtilmeli \n"
 
 #: ../web/swat.c:1012
 msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " \"Yeni ve Tekrar Girilmi� �ifreler\" belirtilmeli \n"
+msgstr " \"Yeni ve Tekrar Girilmiş Şifreler\" belirtilmeli \n"
 
 #: ../web/swat.c:1018
 msgid " Re-typed password didn't match new password "
-msgstr " Tekrar girilen �ifre yeni �ifre ile e�le�medi\n"
+msgstr " Tekrar girilen şifre yeni şifre ile eşleşmedi\n"
 
 #: ../web/swat.c:1048
 #, c-format
 msgid " The passwd for '%s' has been changed."
-msgstr " '%s' i�in �ifre de�i�tirildi."
+msgstr " '%s' için şifre değiştirildi."
 
 #: ../web/swat.c:1051
 #, c-format
 msgid " The passwd for '%s' has NOT been changed."
-msgstr " '%s' i�in �ifre DE���T�R�LMED�."
+msgstr " '%s' için şifre DEĞİŞTİRİLMEDİ."
 
 #: ../web/swat.c:1076
 msgid "Server Password Management"
-msgstr "Sunucu �ifre Y�netimi"
+msgstr "Sunucu Şifre Yönetimi"
 
 #.
 #. * Create all the dialog boxes for data collection
 #.
 #: ../web/swat.c:1085 ../web/swat.c:1132
 msgid "User Name"
-msgstr " Kullan�c� Ad�"
+msgstr " Kullanıcı Adı"
 
 #: ../web/swat.c:1088 ../web/swat.c:1134
 msgid "Old Password"
-msgstr " Eski �ifre"
+msgstr " Eski Şifre"
 
 #: ../web/swat.c:1091 ../web/swat.c:1136
 msgid "New Password"
-msgstr " Yeni �ifre"
+msgstr " Yeni Şifre"
 
 #: ../web/swat.c:1093 ../web/swat.c:1138
 msgid "Re-type New Password"
-msgstr " Yeni �ifre Tekrar�"
+msgstr " Yeni Şifre Tekrarı"
 
 #: ../web/swat.c:1101 ../web/swat.c:1149
 msgid "Change Password"
-msgstr "�ifre De�i�tir"
+msgstr "Şifre Değiştir"
 
 #: ../web/swat.c:1104
 msgid "Add New User"
@@ -309,15 +309,15 @@ msgstr "Kull. Sil"
 
 #: ../web/swat.c:1108
 msgid "Disable User"
-msgstr "Kull. Etkisizle�tir"
+msgstr "Kull. Etkisizleştir"
 
 #: ../web/swat.c:1110
 msgid "Enable User"
-msgstr "Kull. Etkinle�tir"
+msgstr "Kull. Etkinleştir"
 
 #: ../web/swat.c:1123
 msgid "Client/Server Password Management"
-msgstr "�stemci/Sunucu �ifre Y�netimi"
+msgstr "İstemci/Sunucu Şifre Yönetimi"
 
 #: ../web/swat.c:1140
 msgid "Remote Machine"
@@ -325,39 +325,39 @@ msgstr " Uzak Makina"
 
 #: ../web/swat.c:1179
 msgid "Printer Parameters"
-msgstr "Yaz�c� Bilgileri"
+msgstr "Yazıcı Bilgileri"
 
 #: ../web/swat.c:1181
 msgid "Important Note:"
-msgstr "�nemli Not:"
+msgstr "Önemli Not:"
 
 #: ../web/swat.c:1182
 msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Yaz�c� Se� kutusunda [*] ile i�aretlenmi� yaz�c� isimleri "
+msgstr "Yazıcı Seç kutusunda [*] ile işaretlenmiş yazıcı isimleri "
 
 #: ../web/swat.c:1183
 msgid "are autoloaded printers from "
-msgstr "otomatik y�klenen yaz�c�lar "
+msgstr "otomatik yüklenen yazıcılar "
 
 #: ../web/swat.c:1184
 msgid "Printcap Name"
-msgstr "Printcap Ad�"
+msgstr "Printcap Adı"
 
 #: ../web/swat.c:1185
 msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Bu yaz�c�lar� SWAT'dan silmek etkisiz olacakt�r.\n"
+msgstr "Bu yazıcıları SWAT'dan silmek etkisiz olacaktır.\n"
 
 #: ../web/swat.c:1231
 msgid "Choose Printer"
-msgstr "Yaz�c� Se�"
+msgstr "Yazıcı Seç"
 
 #: ../web/swat.c:1250
 msgid "Delete Printer"
-msgstr "Yaz�c� Sil"
+msgstr "Yazıcı Sil"
 
 #: ../web/swat.c:1257
 msgid "Create Printer"
-msgstr "Yaz�c� Olu�tur"
+msgstr "Yazıcı Oluştur"
 
 #: ../web/statuspage.c:123
 msgid "RDONLY     "
@@ -381,7 +381,7 @@ msgstr "Oto Tazele"
 
 #: ../web/statuspage.c:315 ../web/statuspage.c:320
 msgid "Refresh Interval: "
-msgstr "Tazeleme Aral���: "
+msgstr "Tazeleme Aralığı: "
 
 #: ../web/statuspage.c:319
 msgid "Stop Refreshing"
@@ -389,7 +389,7 @@ msgstr "Tazelemeyi Durdur"
 
 #: ../web/statuspage.c:334
 msgid "version:"
-msgstr "s�r�m:"
+msgstr "sürüm:"
 
 #: ../web/statuspage.c:337
 msgid "smbd:"
@@ -397,11 +397,11 @@ msgstr "smbd:"
 
 #: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
 msgid "running"
-msgstr "�al���yor"
+msgstr "çalışıyor"
 
 #: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
 msgid "not running"
-msgstr "�al��m�yor"
+msgstr "çalışmıyor"
 
 #: ../web/statuspage.c:341
 msgid "Stop smbd"
@@ -409,11 +409,11 @@ msgstr "Smbd'yi durdur"
 
 #: ../web/statuspage.c:343
 msgid "Start smbd"
-msgstr "Smbd'yi �al��t�r"
+msgstr "Smbd'yi çalıştır"
 
 #: ../web/statuspage.c:345
 msgid "Restart smbd"
-msgstr "Smbd'yi yeniden �al��t�r"
+msgstr "Smbd'yi yeniden çalıştır"
 
 #: ../web/statuspage.c:350
 msgid "nmbd:"
@@ -425,11 +425,11 @@ msgstr "Nmbd'yi durdur"
 
 #: ../web/statuspage.c:356
 msgid "Start nmbd"
-msgstr "Nmbd'yi �al��t�r"
+msgstr "Nmbd'yi çalıştır"
 
 #: ../web/statuspage.c:358
 msgid "Restart nmbd"
-msgstr "Nmbd'yi yeniden �al��t�r"
+msgstr "Nmbd'yi yeniden çalıştır"
 
 #: ../web/statuspage.c:364
 msgid "winbindd:"
@@ -441,11 +441,11 @@ msgstr "Nmbd'yi durdur"
 
 #: ../web/statuspage.c:370
 msgid "Start winbindd"
-msgstr "Nmbd'yi �al��t�r"
+msgstr "Nmbd'yi çalıştır"
 
 #: ../web/statuspage.c:372
 msgid "Restart winbindd"
-msgstr "Nmbd'yi yeniden �al��t�r"
+msgstr "Nmbd'yi yeniden çalıştır"
 
 #. stop, restart all
 #: ../web/statuspage.c:381
@@ -454,16 +454,16 @@ msgstr ""
 
 #: ../web/statuspage.c:382
 msgid "Restart All"
-msgstr "Nmbd'yi yeniden �al��t�r"
+msgstr "Nmbd'yi yeniden çalıştır"
 
 #. start all
 #: ../web/statuspage.c:386
 msgid "Start All"
-msgstr "Nmbd'yi �al��t�r"
+msgstr "Nmbd'yi çalıştır"
 
 #: ../web/statuspage.c:393
 msgid "Active Connections"
-msgstr "Aktif Ba�lant�lar"
+msgstr "Aktif Bağlantılar"
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
 msgid "PID"
@@ -471,11 +471,11 @@ msgstr "PID"
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408
 msgid "Client"
-msgstr "�stemci"
+msgstr "İstemci"
 
 #: ../web/statuspage.c:395
 msgid "IP address"
-msgstr "IP numaras�"
+msgstr "IP numarası"
 
 #: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
 msgid "Date"
@@ -487,15 +487,15 @@ msgstr "Kapat"
 
 #: ../web/statuspage.c:405
 msgid "Active Shares"
-msgstr "Aktif Payla��mlar"
+msgstr "Aktif Paylaşımlar"
 
 #: ../web/statuspage.c:408
 msgid "Share"
-msgstr "Payla��m"
+msgstr "Paylaşım"
 
 #: ../web/statuspage.c:408
 msgid "User"
-msgstr "Kullan�c�"
+msgstr "Kullanıcı"
 
 #: ../web/statuspage.c:408
 msgid "Group"
@@ -503,11 +503,11 @@ msgstr "Grup"
 
 #: ../web/statuspage.c:414
 msgid "Open Files"
-msgstr "A��k Dosyalar"
+msgstr "Açık Dosyalar"
 
 #: ../web/statuspage.c:416
 msgid "Sharing"
-msgstr "Payla��l�yor"
+msgstr "Paylaşılıyor"
 
 #: ../web/statuspage.c:416
 msgid "R/W"
@@ -531,64 +531,64 @@ msgstr ""
 
 #: ../param/loadparm.c:755
 msgid "Base Options"
-msgstr "Temel Se�enekler"
+msgstr "Temel Seçenekler"
 
 #: ../param/loadparm.c:775
 msgid "Security Options"
-msgstr "G�venlik Se�enekleri"
+msgstr "Güvenlik Seçenekleri"
 
 #: ../param/loadparm.c:859
 msgid "Logging Options"
-msgstr "G�nl�k Kayd� Se�enekleri"
+msgstr "Günlük Kaydı Seçenekleri"
 
 #: ../param/loadparm.c:874
 msgid "Protocol Options"
-msgstr "Protokol Se�enekleri"
+msgstr "Protokol Seçenekleri"
 
 #: ../param/loadparm.c:911
 msgid "Tuning Options"
-msgstr "Ayar Se�enekleri"
+msgstr "Ayar Seçenekleri"
 
 #: ../param/loadparm.c:940
 msgid "Printing Options"
-msgstr "Yazd�rma Se�enekleri"
+msgstr "Yazdırma Seçenekleri"
 
 #: ../param/loadparm.c:970
 msgid "Filename Handling"
-msgstr "Dosyaad� ��lenmesi"
+msgstr "Dosyaadı İşlenmesi"
 
 #: ../param/loadparm.c:996
 msgid "Domain Options"
-msgstr "Alan Se�enekleri"
+msgstr "Alan Seçenekleri"
 
 #: ../param/loadparm.c:1000
 msgid "Logon Options"
-msgstr "Sistem Giri� Se�enekleri"
+msgstr "Sistem Giriş Seçenekleri"
 
 #: ../param/loadparm.c:1019
 msgid "Browse Options"
-msgstr "G�zatma Se�enekleri"
+msgstr "Gözatma Seçenekleri"
 
 #: ../param/loadparm.c:1033
 msgid "WINS Options"
-msgstr "WINS Se�enekleri"
+msgstr "WINS Seçenekleri"
 
 #: ../param/loadparm.c:1043
 msgid "Locking Options"
-msgstr "Kilitleme Se�enekleri"
+msgstr "Kilitleme Seçenekleri"
 
 #: ../param/loadparm.c:1061
 msgid "Ldap Options"
-msgstr "Ldap Se�enekleri"
+msgstr "Ldap Seçenekleri"
 
 #: ../param/loadparm.c:1078
 msgid "Miscellaneous Options"
-msgstr "Di�er Se�enekler"
+msgstr "Diğer Seçenekler"
 
 #: ../param/loadparm.c:1138
 msgid "VFS module options"
-msgstr "VFS Se�enekleri"
+msgstr "VFS Seçenekleri"
 
 #: ../param/loadparm.c:1148
 msgid "Winbind options"
-msgstr "Winbind se�enekleri"
+msgstr "Winbind seçenekleri"
diff --git a/swat/include/header.html b/swat/include/header.html
index f964133316..c482aedcb8 100644
--- a/swat/include/header.html
+++ b/swat/include/header.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>Samba Web Administration Tool</TITLE>
 </HEAD>
 <BODY bgcolor="white">
diff --git a/swat/lang/ja/help/welcome.html b/swat/lang/ja/help/welcome.html
index 240ad22cef..bcae8e9a5e 100644
--- a/swat/lang/ja/help/welcome.html
+++ b/swat/lang/ja/help/welcome.html
@@ -1,69 +1,69 @@
-<h3>SWAT �ւ悤����!</h3>

+<h3>SWAT へようこそ!</h3>

 

-��̃{�^�����N���b�N���Đݒ���s���Ă��������B

+上のボタンをクリックして設定を行ってください。

 

-<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> �h�L�������g</h3>

+<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> ドキュメント</h3>

 

 <ul>

- <li><b>�f�[����</b>

+ <li><b>デーモン</b>

    <ul>

-    <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - SMB �f�[����

-    <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS �l�[���T�[�o

-    <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind �f�[����

+    <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - SMB デーモン

+    <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS ネームサーバ

+    <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind デーモン

    </ul>

- <li><b>�ݒ�t�@�C��</b>

+ <li><b>設定ファイル</b>

    <ul>

-    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - Samba �ݒ�t�@�C��

-    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS �� hosts �t�@�C��

-    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB �p�X���[�h�t�@�C��

+    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - Samba 設定ファイル

+    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS の hosts ファイル

+    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB パスワードファイル

    </ul>

- <li><b>�Ǘ����[�e�B���e�B</b>

+ <li><b>管理ユーティリティ</b>

    <ul>

-    <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba �f�[�����ւ̃R���g���[�����b�Z�[�W�̑��o

-    <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB �p�X���[�h�̊Ǘ�

-    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - Web �ݒ�c�[��

-    <li><a href="/swat/help/net.8.html" target="docs">net</a> - Samba ����у����[�g�� CIFS �T�[�o�̊Ǘ��c�[��

-    <li><a href="/swat/help/pdbedit.8.html" target="docs">pdbedit</a> - Samba �̃��[�U�A�J�E���g�Ǘ��c�[��

-    <li><a href="/swat/help/tdbbackup.8.html" target="docs">tdbbackup</a> - TDB �f�[�^�x�[�X�̃o�b�N�A�b�v�c�[��

+    <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba デーモンへのコントロールメッセージの送出

+    <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB パスワードの管理

+    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - Web 設定ツール

+    <li><a href="/swat/help/net.8.html" target="docs">net</a> - Samba およびリモートの CIFS サーバの管理ツール

+    <li><a href="/swat/help/pdbedit.8.html" target="docs">pdbedit</a> - Samba のユーザアカウント管理ツール

+    <li><a href="/swat/help/tdbbackup.8.html" target="docs">tdbbackup</a> - TDB データベースのバックアップツール

    </ul>

- <li><b>�N���C�A���g�c�[��</b>

+ <li><b>クライアントツール</b>

    <ul>

-    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - �R�}���h���C���� MS-RPC �N���C�A���g

-    <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB �o�b�N�A�b�v�c�[��

-    <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - �R�}���h���C���� SMB �N���C�A���g

-    <li><a href="/swat/help/smbmnt.8.html"  target="docs">smbmnt</a> - Linux ��� SMB �t�@�C���V�X�e�����}�E���g����ۂ̕⏕�c�[��

-    <li><a href="/swat/help/smbmount.8.html"  target="docs">smbmount</a> - Linux �ɂ����� SMB �t�@�C���V�X�e���̃}�E���g���������郆�[�U��Ԃ̃c�[��

-    <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - �R�}���h���C���� SMB ����N���C�A���g

-    <li><a href="/swat/help/smbumount.8.html"  target="docs">smbumount</a> - Linux �ɂ����� SMB �t�@�C���V�X�e���̃A���}�E���g���������郆�[�U��Ԃ̃c�[��

-    <li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - �ʃv���O��������� NTLM �F�؂̎g�p������

-    <li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - NTFS 5 ���L�̃N�H�[�^���̐ݒ�Ǝ擾

-    <li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - UNIX �V�F����p���������[�g SMB ���L�ւ̃A�N�Z�X������

-    <li><a href="/swat/help/smbtree.1.html" target="docs">smbtree</a> - �e�L�X�g�x�[�X�� SMB �l�b�g���[�N�u���E�W���O

-    <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - ����W���u�� SMB �v�����^�ɑ��M

+    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - コマンドラインの MS-RPC クライアント

+    <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB バックアップツール

+    <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - コマンドラインの SMB クライアント

+    <li><a href="/swat/help/smbmnt.8.html"  target="docs">smbmnt</a> - Linux 上の SMB ファイルシステムをマウントする際の補助ツール

+    <li><a href="/swat/help/smbmount.8.html"  target="docs">smbmount</a> - Linux における SMB ファイルシステムのマウントを実現するユーザ空間のツール

+    <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - コマンドラインの SMB 印刷クライアント

+    <li><a href="/swat/help/smbumount.8.html"  target="docs">smbumount</a> - Linux における SMB ファイルシステムのアンマウントを実現するユーザ空間のツール

+    <li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - 別プログラムからの NTLM 認証の使用を実現

+    <li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - NTFS 5 共有のクォータ情報の設定と取得

+    <li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - UNIX シェルを用いたリモート SMB 共有へのアクセスを実現

+    <li><a href="/swat/help/smbtree.1.html" target="docs">smbtree</a> - テキストベースの SMB ネットワークブラウジング

+    <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - 印刷ジョブを SMB プリンタに送信

    </ul>

- <li><b>�f�f���[�e�B���e�B</b>

+ <li><b>診断ユーティリティ</b>

    <ul>

-    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba �̊Ď�

-    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - �ݒ�t�@�C���̐������̌���

-    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - �v�����^�ݒ�̌���

-    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS ���̌����c�[��

-    <li><a href="/swat/help/wbinfo.1.html" target="docs">wbinfo</a> - winbind ���̎擾�c�[��

+    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba の監視

+    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - 設定ファイルの整合性の検査

+    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - プリンタ設定の検査

+    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS 名の検索ツール

+    <li><a href="/swat/help/wbinfo.1.html" target="docs">wbinfo</a> - winbind 情報の取得ツール

    </ul>

- <li><b>���̑��̃��[�e�B���e�B</b>

+ <li><b>その他のユーティリティ</b>

    <ul>

-    <li><a href="/swat/help/profiles.1.html" target="docs">profiles</a> - �ʃh���C���ւ̃v���t�@�C���̈ڍs

-    <li><a href="/swat/help/editreg.1.html" target="docs">editreg</a> - Windows ���W�X�g���t�@�C���̕ҏW

-    <li><a href="/swat/help/log2pcap.1.html" target="docs">log2pcap</a> - Samba �̃��O�t�@�C������ pcap �t�@�C���̐���

+    <li><a href="/swat/help/profiles.1.html" target="docs">profiles</a> - 別ドメインへのプロファイルの移行

+    <li><a href="/swat/help/editreg.1.html" target="docs">editreg</a> - Windows レジストリファイルの編集

+    <li><a href="/swat/help/log2pcap.1.html" target="docs">log2pcap</a> - Samba のログファイルから pcap ファイルの生成

    </ul>

- <li><b>����</b>

+ <li><b>書籍</b>

    <ul>

-    <li><a href="/swat/using_samba/toc.html" target="docs">Using Samba ����</a> - ����: Jay Ts, Robert Eckstein, David Collier-Brown

-    <li><a href="/swat/help/Samba-HOWTO-Collection.html">Samba HOWTO �R���N�V����</a>

+    <li><a href="/swat/using_samba/toc.html" target="docs">Using Samba 第二版</a> - 著者: Jay Ts, Robert Eckstein, David Collier-Brown

+    <li><a href="/swat/help/Samba-HOWTO-Collection.html">Samba HOWTO コレクション</a>

    </ul>

 </ul>

  

- <h3>�t�B�[�h�o�b�N</h3>

+ <h3>フィードバック</h3>

 

- ���̃o�[�W������ SWAT �Ɋւ�����ɂ‚��Ă̋c�_���s�Ȃ��������́A

- <A HREF="http://lists.samba.org/">samba</A> ���[�����O���X�g�ւ̎Q�������肢���܂��B

-<small>(�������� <A HREF="http://www.samba.gr.jp/ml/">sugj-tech</A> ���[�����O���X�g�ɓ��{��ł��肢���܂�)</small>

+ このバージョンの SWAT に関する問題についての議論を行ないたい方は、

+ <A HREF="http://lists.samba.org/">samba</A> メーリングリストへの参加をお願いします。

+<small>(もしくは <A HREF="http://www.samba.gr.jp/ml/">sugj-tech</A> メーリングリストに日本語でお願いします)</small>

diff --git a/swat/lang/ja/include/footer.html b/swat/lang/ja/include/footer.html
deleted file mode 100644
index 7c3b483684..0000000000
--- a/swat/lang/ja/include/footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-</TD></TR></TABLE></CENTER>
-</BODY>
-</HTML>
diff --git a/swat/lang/ja/include/header.html b/swat/lang/ja/include/header.html
deleted file mode 100644
index 2fbe9bb754..0000000000
--- a/swat/lang/ja/include/header.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-<TITLE>Samba Web Administration Tool</TITLE>
-<link rel="STYLESHEET" type="text/css" href="/swat/include/header_css.html">
-</HEAD>
-<BODY bgcolor="white">
-<CENTER>
-<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-<TR><TD BGCOLOR="#ddddd0">
diff --git a/swat/lang/ja/include/header.nocss.html b/swat/lang/ja/include/header.nocss.html
deleted file mode 100644
index 56d13dbc6d..0000000000
--- a/swat/lang/ja/include/header.nocss.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-<TITLE>Samba Web Administration Tool</TITLE>
-</HEAD>
-<BODY bgcolor="white">
-<CENTER>
-<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-<TR><TD BGCOLOR="#ddddd0">
diff --git a/swat/lang/ja/include/header_css.html b/swat/lang/ja/include/header_css.html
deleted file mode 100644
index b70876b6f8..0000000000
--- a/swat/lang/ja/include/header_css.html
+++ /dev/null
@@ -1 +0,0 @@
-.i18n_translated_parm {color: #555555}
diff --git a/swat/lang/tr/help/welcome.html b/swat/lang/tr/help/welcome.html
index 617f3678d3..2dc4c092a0 100644
--- a/swat/lang/tr/help/welcome.html
+++ b/swat/lang/tr/help/welcome.html
@@ -1,8 +1,8 @@
-<h3>Swat'a Ho�geldiniz!</h3>
+<h3>Swat'a Hoşgeldiniz!</h3>
 
-Yukar�daki d��melerden birini kullanarak bir ayar eylemi se�in.
+Yukarıdaki düğmelerden birini kullanarak bir ayar eylemi seçin.
 
-<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> D�k�mantasyon</h3>
+<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Dökümantasyon</h3>
 
 <ul>
  <li><b>Sunucular</b>
@@ -11,59 +11,59 @@ Yukar�daki d��melerden birini kullanarak bir ayar eylemi se�in.
     <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS isim sunucusu
     <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind sunucusu
    </ul>
- <li><b>Ayar dosyalar�</b>
+ <li><b>Ayar dosyaları</b>
    <ul>
-    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - ana Samba ayar dosyas�
-    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts dosyas�
-    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB �ifre dosyas�
+    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - ana Samba ayar dosyası
+    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts dosyası
+    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB şifre dosyası
    </ul>
- <li><b>Y�netim Ara�lar�</b>
+ <li><b>Yönetim Araçları</b>
    <ul>
-    <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba sunucular�na kontrol iletileri g�nderir
-    <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB �ifrelerini d�zenler
-    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web aray�zl� ayar arac�
-    <li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - kod sayfas� olu�turur
-    <li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode e�le�me dosyas� olu�turur
-    <li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - i�sel smbd arac�
+    <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba sunucularına kontrol iletileri gönderir
+    <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB şifrelerini düzenler
+    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web arayüzlü ayar aracı
+    <li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - kod sayfası oluşturur
+    <li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode eşleşme dosyası oluşturur
+    <li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - içsel smbd aracı
    </ul>
- <li><b>�stemci Ara�lar�</b>
+ <li><b>İstemci Araçları</b>
    <ul>
-    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - komut sat�r� MS-RPC istemcisi
-    <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB yedekleme arac�
-    <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - komut sat�r� SMB istemcisi
-    <li><a href="/swat/help/smbmnt.8.html"  target="docs">smbmnt</a> - Linux makinalar�na SMB dosya sistemlerini ba�lamak i�in yard�mc� ara�
-    <li><a href="/swat/help/smbmount.8.html"  target="docs">smbmount</a> - Linux alt�nda SMB dosya sistemlerini ba�lamak i�in kullan�c� arac�
-    <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - komut sat�r� SMB yaz�c� istemcisi
-    <li><a href="/swat/help/smbumount.8.html"  target="docs">smbumount</a> - Linux alt�nda SMB dosya sistemlerini ��zmek i�in kullan�c� arac�
+    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - komut satırı MS-RPC istemcisi
+    <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB yedekleme aracı
+    <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - komut satırı SMB istemcisi
+    <li><a href="/swat/help/smbmnt.8.html"  target="docs">smbmnt</a> - Linux makinalarına SMB dosya sistemlerini bağlamak için yardımcı araç
+    <li><a href="/swat/help/smbmount.8.html"  target="docs">smbmount</a> - Linux altında SMB dosya sistemlerini bağlamak için kullanıcı aracı
+    <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - komut satırı SMB yazıcı istemcisi
+    <li><a href="/swat/help/smbumount.8.html"  target="docs">smbumount</a> - Linux altında SMB dosya sistemlerini çözmek için kullanıcı aracı
    </ul>
- <li><b>Te�his Ara�lar�</b>
+ <li><b>Teşhis Araçları</b>
    <ul>
-    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba g�zlemcisi
-    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyas�n� kontrol eder
-    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yaz�c� ayarlar�n� kontrol eder
-    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama arac�
+    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi
+    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder
+    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder
+    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı
    </ul>
  <li><b>Kitaplar</b>
    <ul>
-    <li><a href="/swat/using_samba/index.html" target="docs">Samba'y� Kullanmak</a> - Yazan: Robert Eckstein, David Collier-Brown ve Peter Kelly
+    <li><a href="/swat/using_samba/index.html" target="docs">Samba'yı Kullanmak</a> - Yazan: Robert Eckstein, David Collier-Brown ve Peter Kelly
    </ul>
- <li><b>Samba HOWTO (Nas�l Yap�l�r?) Koleksiyonu</b></li>
+ <li><b>Samba HOWTO (Nasıl Yapılır?) Koleksiyonu</b></li>
    <ul>
-     <li><a href="/swat/help/Samba-HOWTO-Collection.html">B�t�n koleksiyon (tek dosya)</a>
+     <li><a href="/swat/help/Samba-HOWTO-Collection.html">Bütün koleksiyon (tek dosya)</a>
      <li><a href="/swat/help/DOMAIN_MEMBER.html">Samba 2.x'de security = domain </a>
-     <li><a href="/swat/help/winbind.html">Winbind Kullanarak Windows NT ve UNIX Aras�nda Birle�ik Sistem Giri�i</a>
-     <li><a href="/swat/help/msdfs_setup.html">Samba'y� bir MS-DFS Sunucusu Olarak Ayarlamak</a>
-     <li><a href="/swat/help/NT_Security.html">UNIX �zin Bitleri ve Samba 2.x</a>
-     <li><a href="/swat/help/OS2-Client-HOWTO.html">OS/2 �stemcileri ve Samba</a>
-     <li><a href="/swat/help/printer_driver2.html">Samba 2.2.x Alt�nda Yaz�c� Kullan�m�</a>
-     <li><a href="/swat/help/UNIX_INSTALL.html">Samba Nas�l Kurulur ve Kontrol Edilir?</a>
-     <li><a href="/swat/help/Integrating-with-Windows.html">�sim ��z�nme ve Yetkilendirme ��lemlerini Birle�tirmek</a>
-     <li><a href="/swat/help/CVS-Access.html">Samba yaz�l�mlar�na CVS Eri�imi</a>
+     <li><a href="/swat/help/winbind.html">Winbind Kullanarak Windows NT ve UNIX Arasında Birleşik Sistem Girişi</a>
+     <li><a href="/swat/help/msdfs_setup.html">Samba'yı bir MS-DFS Sunucusu Olarak Ayarlamak</a>
+     <li><a href="/swat/help/NT_Security.html">UNIX İzin Bitleri ve Samba 2.x</a>
+     <li><a href="/swat/help/OS2-Client-HOWTO.html">OS/2 İstemcileri ve Samba</a>
+     <li><a href="/swat/help/printer_driver2.html">Samba 2.2.x Altında Yazıcı Kullanımı</a>
+     <li><a href="/swat/help/UNIX_INSTALL.html">Samba Nasıl Kurulur ve Kontrol Edilir?</a>
+     <li><a href="/swat/help/Integrating-with-Windows.html">İsim Çözünme ve Yetkilendirme İşlemlerini Birleştirmek</a>
+     <li><a href="/swat/help/CVS-Access.html">Samba yazılımlarına CVS Erişimi</a>
    </ul>
 </ul>
 
- <h3>�leti�im</h3>
+ <h3>İletişim</h3>
 
- E�er SWAT'�n bu s�r�m� ile ilgili konular� tart��mak istiyorsan�z, l�tfen
-<A HREF="http://lists.samba.org/">samba</A> eposta listesine �ye olun.
+ Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen
+<A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun.
  
\ No newline at end of file
diff --git a/swat/lang/tr/include/header.html b/swat/lang/tr/include/header.html
deleted file mode 100644
index 7c11fd0ef9..0000000000
--- a/swat/lang/tr/include/header.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<TITLE>Samba Web Y�netim Arac�</TITLE>
-</HEAD>
-<BODY bgcolor="white">
-<CENTER>
-<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-<TR><TD BGCOLOR="#ddddd0">