[CRYPTUI]

- Sync to Wine 1.3.37

svn path=/trunk/; revision=56166

reactos/dll/win32/cryptui/cryptui.spec

@@ -2,9 +2,9 @@
 2 stdcall CryptUIDlgCertMgr(ptr)
 3 stub CryptUIDlgFreeCAContext
 4 stub CryptUIDlgSelectCA
-5 stub CryptUIDlgSelectCertificateA
+5 stdcall CryptUIDlgSelectCertificateA(ptr)
 6 stub CryptUIDlgSelectCertificateFromStore
-7 stub CryptUIDlgSelectCertificateW
+7 stdcall CryptUIDlgSelectCertificateW(ptr)
 8 stdcall CryptUIDlgSelectStoreA(ptr)
 9 stdcall CryptUIDlgSelectStoreW(ptr)
 10 stub CryptUIDlgViewCRLA
@@ -16,7 +16,7 @@
 16 stub CryptUIDlgViewCertificatePropertiesW
 17 stdcall CryptUIDlgViewCertificateW(ptr ptr)
 18 stdcall CryptUIDlgViewContext(long ptr ptr wstr long ptr)
-19 stub CryptUIDlgViewSignerInfoA
+19 stdcall CryptUIDlgViewSignerInfoA(ptr)
 20 stub CryptUIDlgViewSignerInfoW
 21 stub CryptUIFreeCertificatePropertiesPagesA
 22 stub CryptUIFreeCertificatePropertiesPagesW

reactos/dll/win32/cryptui/cryptui_De.rc

@@ -1,7 +1,7 @@
 /*
  * cryptui dll resources
  *
- * Copyright 2009 André Hentschel
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,7 @@
 
 #include "cryptuires.h"
 
-#pragma code_page(65001)
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
@@ -57,7 +55,7 @@ STRINGTABLE
     IDS_FIELD_VALID_TO "Gültig bis"
     IDS_FIELD_SUBJECT "Antragsteller"
     IDS_FIELD_PUBLIC_KEY "Öffentlicher Schlüssel"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d Bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! Bits)"
     IDS_PROP_HASH "SHA1 Hash"
     IDS_PROP_ENHKEY_USAGE "Erweiterte Schlüsselnutzung (Eigenschaft)"
     IDS_PROP_FRIENDLY_NAME "Angezeigter Name"
@@ -82,7 +80,7 @@ STRINGTABLE
     IDS_IMPORT_FILTER_ALL "Alle Dateien (*.*)"
     IDS_IMPORT_EMPTY_FILE "Bitte wählen Sie eine Datei."
     IDS_IMPORT_BAD_FORMAT "Unbekanntes Format. Wählen Sie eine andere Datei."
-    IDS_IMPORT_OPEN_FAILED "Konnte die Datei nicht öffnen: "
+    IDS_IMPORT_OPEN_FAILED "Konnte die Datei nicht öffnen "
     IDS_IMPORT_DEST_DETERMINED "Automatisch ausgewählt"
     IDS_IMPORT_SELECT_STORE "Bitte wählen Sie einen Speicher"
     IDS_IMPORT_STORE_SELECTION "Zertifikatsspeicher gewählt"
@@ -94,7 +92,7 @@ STRINGTABLE
     IDS_IMPORT_CONTENT_CTL "Zertifikatsvertrauensliste"
     IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Zertifikat"
     IDS_IMPORT_CONTENT_PFX "Privater Informationsaustausch"
-    IDS_IMPORT_CONTENT_STORE "Zertifikatsspeicher"
+    IDS_IMPORT_CONTENT_STORE "Zertifikatsspeicher wählen"
     IDS_IMPORT_SUCCEEDED "Importvorgang erfolgreich."
     IDS_IMPORT_FAILED "Importvorgang gescheitert."
     IDS_WIZARD_TITLE_FONT "Arial"
@@ -106,23 +104,34 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Angezeigter Name"
     IDS_ALLOWED_PURPOSE_ALL "<Alle>"
     IDS_ALLOWED_PURPOSE_NONE "<Keine>"
-    IDS_WARN_REMOVE_MY "Sie sind danach nicht länger fähig Nachrichten mit diesem Zertifikat zu entschlüsseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie es löschen möchten?"
+    IDS_WARN_REMOVE_MY "Sie sind danach nicht länger fähig Nachrichten mit diesem Zertifikat zu entschlüsseln oder zu unterzeichnen.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Sie sind danach nicht länger fähig Nachrichten mit diesen Zertifikaten zu entschlüsseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie sie löschen möchten?"
+Sind Sie sicher, dass Sie es löschen möchten?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Sie sind danach nicht länger fähig Nachrichten mit diesem Zertifikat zu entschlüsseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie es löschen möchten?"
+    IDS_WARN_REMOVE_PLURAL_MY "Sie sind danach nicht länger fähig Nachrichten mit diesen Zertifikaten zu entschlüsseln oder zu unterzeichnen.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Sie sind danach nicht länger fähig Nachrichten mit diesen Zertifikaten zu entschlüsseln oder zu unterzeichnen.\nSind Sie sicher, dass Sie sie löschen möchten?"
+Sind Sie sicher, dass Sie sie löschen möchten?"
-    IDS_WARN_REMOVE_CA "Von dieser CA ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\nSind Sie sicher, dass Sie es löschen möchten?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Sie sind danach nicht länger fähig Nachrichten mit diesem Zertifikat zu entschlüsseln oder zu unterzeichnen.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Von diesen CAs ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\nSind Sie sicher, dass Sie sie löschen möchten?"
+Sind Sie sicher, dass Sie es löschen möchten?"
-    IDS_WARN_REMOVE_ROOT "Von dieser Stamm-CA ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\nSind Sie sicher, dass Sie es löschen möchten?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Sie sind danach nicht länger fähig Nachrichten mit diesen Zertifikaten zu entschlüsseln oder zu unterzeichnen.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Von diesen Stamm-CAs ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\nSind Sie sicher, dass Sie sie löschen möchten?"
+Sind Sie sicher, dass Sie sie löschen möchten?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software die von diesem Hersteller signiert ist wird nicht länger vertrauenswürdig sein.\nSind Sie sicher, dass Sie ihn löschen möchten?"
+    IDS_WARN_REMOVE_CA "Von dieser CA ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software die von diesen Herstellern signiert ist wird nicht länger vertrauenswürdig sein.\nSind Sie sicher, dass Sie sie löschen möchten?"
+Sind Sie sicher, dass Sie es löschen möchten?"
+    IDS_WARN_REMOVE_PLURAL_CA "Von diesen CAs ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\n\
+Sind Sie sicher, dass Sie sie löschen möchten?"
+    IDS_WARN_REMOVE_ROOT "Von dieser Stamm-CA ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\n\
+Sind Sie sicher, dass Sie es löschen möchten?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Von diesen Stamm-CAs ausgestellte Zertifikate werden nicht länger vertrauenswürdig sein.\n\
+Sind Sie sicher, dass Sie sie löschen möchten?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software die von diesem Hersteller signiert ist wird nicht länger vertrauenswürdig sein.\n\
+Sind Sie sicher, dass Sie ihn löschen möchten?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software die von diesen Herstellern signiert ist wird nicht länger vertrauenswürdig sein.\n\
+Sind Sie sicher, dass Sie sie löschen möchten?"
     IDS_WARN_REMOVE_DEFAULT "Sind Sie sicher, dass Sie dieses Zertifikat entfernen möchten?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Sind Sie sicher, dass Sie diese Zertifikate entfernen möchten?"
     IDS_CERT_MGR "Zertifikate"
-    IDS_FRIENDLY_NAME_NONE "<Keiner>"
+    IDS_FRIENDLY_NAME_NONE "<Keine>"
     IDS_PURPOSE_SERVER_AUTH "Garantiert die Identität eines entfernten Computers"
     IDS_PURPOSE_CLIENT_AUTH "Beweist Ihre Identität für einen entfernten Computers"
-    IDS_PURPOSE_CODE_SIGNING "Schützt Software vor Manipulation nach der Veröffentlichung"
+    IDS_PURPOSE_CODE_SIGNING "Stellt die Herkunft der Software sicher\n\
+Schützt Software vor Manipulation nach der Veröffentlichung"
     IDS_PURPOSE_EMAIL_PROTECTION "Sichert E-Mail Nachrichten"
     IDS_PURPOSE_IPSEC "Erlaubt sichere Kommunikation über das Internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Erlaubt Daten mit der aktuellen Zeit zu signieren"
@@ -136,16 +145,16 @@ STRINGTABLE
     IDS_PURPOSE_ROOT_LIST_SIGNER "Stammlisten Signierer"
     IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualifizierte Unterordnung"
     IDS_PURPOSE_KEY_RECOVERY "Schlüsselwiederherstellung"
-    IDS_PURPOSE_DOCUMENT_SIGNING "Dokument signieren"
+    IDS_PURPOSE_DOCUMENT_SIGNING "Dokumentensignatur"
-    IDS_PURPOSE_LIFETIME_SIGNING "Lebensdauer signieren"
+    IDS_PURPOSE_LIFETIME_SIGNING "Lebensdauersignatur"
     IDS_PURPOSE_DRM "Digitale Rechte"
-    IDS_PURPOSE_LICENSES "Lizenzschlüssel"
+    IDS_PURPOSE_LICENSES "Schlüsselpaketlizenzen"
-    IDS_PURPOSE_LICENSE_SERVER "Lizenz Server Verifizierung"
+    IDS_PURPOSE_LICENSE_SERVER "Lizenzserver Verifizierung"
-    IDS_PURPOSE_ENROLLMENT_AGENT "Zertifikatsanfrage"
+    IDS_PURPOSE_ENROLLMENT_AGENT "Dienst für Zertifikatsanforderung"
-    IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Anmeldung"
+    IDS_PURPOSE_SMARTCARD_LOGON "Smartcard Anmeldung"
     IDS_PURPOSE_CA_EXCHANGE "Private Schlüsselarchive"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "Schlüsselwiederherstellung"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent zur Schlüsselwiederherstellung"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Verzeichnissdienst E-Mail-Replikation"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Verzeichnisdienst für E-Mail Replikation"
     IDS_EXPORT_WIZARD "Exportassistent für die Zertifikatsverwaltung"
     IDS_EXPORT_FORMAT_TITLE "Export Format"
     IDS_EXPORT_FORMAT_SUBTITLE "Wählen Sie ein Dateiformat."
@@ -181,18 +190,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Zertifikat installieren...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Zertifikat installieren...", IDC_ADDTOSTORE,93,216,80,14
+  PUSHBUTTON "Au&sstellererklärung", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "Au&sstellererklärung", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -201,15 +206,12 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Anzeigen:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 43,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "In &Datei kopieren...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,75,216,98,14
-  PUSHBUTTON "In &Datei kopieren...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -217,11 +219,11 @@ CAPTION "Zertifizierungspfad"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "&Zertifizierungspfad", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "Zertifizierungspfad", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Zertifikat anzeigen", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Zertifikat anzeigen", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "Zertifizierungs&status:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "Zertifikats&status:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -233,8 +235,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Schließen", IDOK,95,216,70,14
+  PUSHBUTTON "Schließen", IDOK,73,216,85,14
-  PUSHBUTTON "weitere &Informationen", IDC_CPS,171,216,76,14
+  PUSHBUTTON "weitere &Informationen", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -243,20 +245,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Name:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Beschreibung:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Zertifikatszwecke", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Zertifikatszwecke", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "&Alle Zwecke für dieses Zertifikat aktivieren",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "A&lle Zwecke für dieses Zertifikat deaktivieren",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Nur &folgende Zwecke aktivieren:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,173,194,71,14
+  PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -277,8 +279,7 @@ BEGIN
   LTEXT "Zertifikatsspeicher wählen den Sie benutzen möchten:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Physikalischen Speicher anzeigen", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Physikalischen Speicher anzeigen", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Abbrechen", IDCANCEL, 144,118,50,14
 END
@@ -287,31 +288,30 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Importassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Willkommen", IDC_IMPORT_TITLE,
+  LTEXT "Willkommen", IDC_IMPORT_TITLE, 115,7,195,30
-    115,1,195,40
+  LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten aus einer Datei zu importieren.\n\
-  LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten aus einer Datei zu importieren.",
+\n\
-    -1, 115,33,195,24
+Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.\n\
-  LTEXT "Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.",
+\n\
-    -1, 115,64,195,40
+Klicken Sie Weiter um fortzufahren.",
-  LTEXT "Klicken Sie Weiter um fortzufahren.",
+    -1, 115,40,195,120
-    -1, 115,111,195,8
 END
 
-IDD_IMPORT_FILE DIALOG 0,0,317,143
+IDD_IMPORT_FILE DIALOG 0,0,317,178
 CAPTION "Importassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Dateiname:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "D&urchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "&Wählen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Hinweis: Es können mehrere Zertifikate in einer Datei folgender Formate gespeichert werden:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Syntaxstandard kryptografischer Meldungen /PKCS #7 Messages (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Privater Informationsaustausch/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Microsoft Speicher serieller Zertifikate (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -319,16 +319,16 @@ CAPTION "Importassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine kann automatisch einen Zertifikatsspeicher wählen, oder Sie wählen einen aus.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "A&utomatisch einen Zertifikatsspeicher wählen",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Alle Zertifikate im folgendem Zertifikatsspeicher speichern:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Durchsuchen...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "&Wählen...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
-IDD_IMPORT_FINISH DIALOG 0,0,317,143
+IDD_IMPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Importassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -344,23 +344,20 @@ BEGIN
 END
 
 IDD_CERT_MGR DIALOG 0,0,335,270
-CAPTION "Zertifikatsverwaltung"
+CAPTION "Zertifikate"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Geplanter Zweck:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importieren...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Exportieren...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Entfernen", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importieren...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Erweitert...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Exportieren...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
+  GROUPBOX "Beabsichtigte Zwecke des Zertifikats", -1,7,194,321,47, BS_GROUPBOX
-  PUSHBUTTON "&Entfernen", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Erweitert...", IDC_MGR_ADVANCED, 277,172,51,14
+  PUSHBUTTON "&Ansicht", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
-  GROUPBOX "Beabsichtigte Zwecke des Zertifikates", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
-  PUSHBUTTON "&Anzeigen...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Schließen", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -383,22 +380,21 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Exportassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Willkommen", IDC_EXPORT_TITLE,
+  LTEXT "Willkommen", IDC_EXPORT_TITLE, 115,7,195,30
-    115,1,195,40
+  LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten in eine Datei zu exportieren.\n\
-  LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten in eine Datei zu exportieren.",
+\n\
-    -1, 115,33,195,16
+Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.\n\
-  LTEXT "Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.",
+\n\
-    -1, 115,56,195,40
+Klicken Sie Weiter um fortzufahren.",
-  LTEXT "Klicken Sie Weiter um fortzufahren.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
 CAPTION "Exportassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Wenn Sie sich entscheiden den privaten Schlüssel zu exportieren, werden Sie später nach einem Passwort gefragt.", -1, 21,1,195,23
+  LTEXT "Wenn Sie sich entscheiden den privaten Schlüssel zu exportieren, werden Sie später nach einem Passwort gefragt.", -1, 21,1,195,25
-  LTEXT "Privaten Schlüssel exportieren?", -1, 21,24,195,15
+  LTEXT "Privaten Schlüssel exportieren?", -1, 21,27,195,10
   AUTORADIOBUTTON "&Ja, privaten Schlüssel exportieren",
     IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Nein, privaten Schlüssel nicht exportieren",
@@ -410,7 +406,7 @@ IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
 CAPTION "Exportassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Passwort:", -1, 21,1,195,10
+  LTEXT "&Kennwort:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "Passwort &bestätigen:", -1, 21,35,195,10
   EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
@@ -422,23 +418,21 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wählen Sie das gewünschte Format:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-codiertes X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "B&ase64-codiertes X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Syntaxstandard kryptografischer Meldungen/PKCS #7 Zertifikate (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,250,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Wenn möglich alle Zertifikate im Zertifizierungspfad einbeziehen",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,250,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "&Privater Informationsaustausch/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,250,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "W&enn möglich alle Zertifikate im Zertifizierungspfad einbeziehen",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,250,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Verstärkte Sicherheit aktivieren",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Priva&ten Schlüssel löschen wenn der Export erfolgreich war",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,250,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
@@ -447,10 +441,10 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Dateiname:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Durchsuchen...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "&Wählen...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
-IDD_EXPORT_FINISH DIALOG 0,0,317,143
+IDD_EXPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Exportassistent für die Zertifikatsverwaltung"
 FONT 8, "MS Shell Dlg"
 BEGIN

reactos/dll/win32/cryptui/cryptui_En.rc

@@ -55,7 +55,7 @@ STRINGTABLE
     IDS_FIELD_VALID_TO "Valid to"
     IDS_FIELD_SUBJECT "Subject"
     IDS_FIELD_PUBLIC_KEY "Public key"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bits)"
     IDS_PROP_HASH "SHA1 hash"
     IDS_PROP_ENHKEY_USAGE "Enhanced key usage (property)"
     IDS_PROP_FRIENDLY_NAME "Friendly name"
@@ -77,7 +77,7 @@ STRINGTABLE
     IDS_IMPORT_FILTER_CTL "Certificate Trust List (*.stl)"
     IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft Serialized Certificate Store (*.sst)"
     IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.spc; *.p7b)"
-    IDS_IMPORT_FILTER_ALL "All Files (*.*)"
+    IDS_IMPORT_FILTER_ALL "All files (*.*)"
     IDS_IMPORT_EMPTY_FILE "Please select a file."
     IDS_IMPORT_BAD_FORMAT "The file format is not recognized.  Please select another file."
     IDS_IMPORT_OPEN_FAILED "Could not open "
@@ -104,24 +104,35 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Friendly Name"
     IDS_ALLOWED_PURPOSE_ALL "<All>"
     IDS_ALLOWED_PURPOSE_NONE "<None>"
-    IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\nAre you sure you want to remove this certificate?"
+    IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\nAre you sure you want to remove these certificates?"
+Are you sure you want to remove this certificate?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\nAre you sure you want to remove this certificate?"
+    IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\nAre you sure you want to remove these certificates?"
+Are you sure you want to remove these certificates?"
-    IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\nAre you sure you want to remove this certificate?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Certificates issued by these certification authorities will no longer be trusted.\nAre you sure you want to remove these certificates?"
+Are you sure you want to remove this certificate?"
-    IDS_WARN_REMOVE_ROOT "Certificates issued by this root certification authority, or any certification authorities it issued, will no longer be trusted.\nAre you sure you want to remove this trusted root certificate?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Certificates issued by these root certification authorities, or any certification authorities they issued, will no longer be trusted.\nAre you sure you want to remove these trusted root certificates?"
+Are you sure you want to remove these certificates?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software signed by this publisher will no longer be trusted.\nAre you sure you want to remove this certificate?"
+    IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software signed by these publishers will no longer be trusted.\nAre you sure you want to remove these certificates?"
+Are you sure you want to remove this certificate?"
+    IDS_WARN_REMOVE_PLURAL_CA "Certificates issued by these certification authorities will no longer be trusted.\n\
+Are you sure you want to remove these certificates?"
+    IDS_WARN_REMOVE_ROOT "Certificates issued by this root certification authority, or any certification authorities it issued, will no longer be trusted.\n\
+Are you sure you want to remove this trusted root certificate?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Certificates issued by these root certification authorities, or any certification authorities they issued, will no longer be trusted.\n\
+Are you sure you want to remove these trusted root certificates?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software signed by this publisher will no longer be trusted.\n\
+Are you sure you want to remove this certificate?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software signed by these publishers will no longer be trusted.\n\
+Are you sure you want to remove these certificates?"
     IDS_WARN_REMOVE_DEFAULT "Are you sure you want to remove this certificate?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?"
     IDS_CERT_MGR "Certificates"
     IDS_FRIENDLY_NAME_NONE "<None>"
-    IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer"
+    IDS_PURPOSE_SERVER_AUTH "Ensures the identity of a remote computer"
     IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer"
-    IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication"
+    IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\n\
-    IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messges"
+Protects software from alteration after publication"
+    IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messages"
     IDS_PURPOSE_IPSEC "Allows secure communication over the Internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Allows data to be signed with the current time"
     IDS_PURPOSE_CTL_USAGE_SIGNING "Allows you to digitally sign a certificate trust list"
@@ -179,18 +190,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "Issuer &Statement", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "Issuer &Statement", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -199,15 +206,12 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Show:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Edit Properties...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Copy to File...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Edit Properties...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Copy to File...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -215,11 +219,11 @@ CAPTION "Certification Path"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Certification &path", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "Certification path", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&View Certificate", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&View Certificate", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "Certificate &status:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "Certificate &status:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -231,8 +235,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Close", IDOK,103,216,70,14
+  PUSHBUTTON "Close", IDOK,73,216,85,14
-  PUSHBUTTON "More &Info", IDC_CPS,177,216,70,14
+  PUSHBUTTON "More &Info", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -241,20 +245,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Friendly name:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Description:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Certificate purposes", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Certificate purposes", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "&Enable all purposes for this certificate",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "D&isable all purposes for this certificate",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Enable &only the following purposes for this certificate:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Add &Purpose...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Add &Purpose...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -275,8 +279,7 @@ BEGIN
   LTEXT "Select the certificate store you want to use:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Show physical stores", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Show physical stores", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Cancel", IDCANCEL, 144,118,50,14
 END
@@ -285,14 +288,13 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Certificate Import Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE,
+  LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\
-  LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.",
+\n\
-    -1, 115,26,195,25
+A certificate can be used to identify you or the computer with which you are communicating.  It can also be used for authentication, and to sign messages.  Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\
-  LTEXT "A certificate can be used to identify you or the computer with which you are communicating.  It can also be used for authentication, and to sign messages.  Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.",
+\n\
-    -1, 115,56,195,40
+To continue, click Next.",
-  LTEXT "To continue, click Next.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
@@ -303,13 +305,13 @@ BEGIN
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
   PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Note:  The following file formats may contain more than one certificate, certificate revocation list, or certificate trust list:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Personal Information Exchange/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Microsoft Serialized Certificate Store (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -317,13 +319,13 @@ CAPTION "Certificate Import Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine can automatically select the certificate store, or you can specify a location for the certificates.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "&Automatically select certificate store",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Place all certificates in the following store:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
@@ -346,19 +348,16 @@ CAPTION "Certificates"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "I&ntended purpose:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Export...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Remove", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Advanced...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Export...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Remove", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Advanced...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Certificate intended purposes", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&View...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&View", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Close", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -381,14 +380,13 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Certificate Export Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE,
+  LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\
-  LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.",
+\n\
-    -1, 115,26,195,25
+A certificate can be used to identify you or the computer with which you are communicating.  It can also be used for authentication, and to sign messages.  Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\
-  LTEXT "A certificate can be used to identify you or the computer with which you are communicating.  It can also be used for authentication, and to sign messages.  Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.",
+\n\
-    -1, 115,56,195,40
+To continue, click Next.",
-  LTEXT "To continue, click Next.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
@@ -420,23 +418,21 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Select the format you want to use:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-encoded X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Include all certificates in the certification path if possible",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Incl&ude all certificates in the certification path if possible",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Enable strong encryption",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Delete the private &key if the export is successful",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143

reactos/dll/win32/cryptui/cryptui_Fr.rc

@@ -1,7 +1,7 @@
 /*
- * cryptui dll French resources
+ * cryptui dll resources
  *
- * Copyright 2009 Frédéric Delanoy
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,10 +20,7 @@
 
 #include "cryptuires.h"
 
-/* UTF-8 */
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-#pragma code_page(65001)
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
@@ -32,11 +29,11 @@ STRINGTABLE
     IDS_CERT_INFO_BAD_SIG "Ce certificat a une signature invalide. Le certificat peut avoir été modifié ou corrompu."
     IDS_CERT_INFO_UNTRUSTED_CA "Ce certificat racine n'est pas approuvé. Pour lui faire confiance, ajoutez-le au magasin de certificats racine de confiance de votre système."
     IDS_CERT_INFO_UNTRUSTED_ROOT "Ce certificat n'a pu être validé par un certificat racine de confiance."
-    IDS_CERT_INFO_PARTIAL_CHAIN "L'émetteur de ce certificat n'a pas été trouvé."
+    IDS_CERT_INFO_PARTIAL_CHAIN "L'émetteur de ce certificat n'a pu être trouvé."
     IDS_CERT_INFO_BAD_PURPOSES "Impossible de vérifier tous les rôles prévus pour ce certificat."
-    IDS_CERT_INFO_PURPOSES "Ce certificat n'est prévu que pour les rôles suivants :"
+    IDS_CERT_INFO_PURPOSES "Ce certificat n'est prévu que pour les rôles suivants :"
-    IDS_SUBJECT_HEADING "Émis pour : "
+    IDS_SUBJECT_HEADING "Émis pour : "
-    IDS_ISSUER_HEADING "Émis par : "
+    IDS_ISSUER_HEADING "Émis par : "
     IDS_VALID_FROM "Valide à partir du "
     IDS_VALID_TO " jusqu'au "
     IDS_CERTIFICATE_BAD_SIGNATURE "Ce certificat a une signature invalide."
@@ -58,7 +55,7 @@ STRINGTABLE
     IDS_FIELD_VALID_TO "Valide jusqu'au"
     IDS_FIELD_SUBJECT "Sujet"
     IDS_FIELD_PUBLIC_KEY "Clé publique"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bits)"
     IDS_PROP_HASH "Empreinte SHA1"
     IDS_PROP_ENHKEY_USAGE "Utilisation complémentaire de la clé (propriété)"
     IDS_PROP_FRIENDLY_NAME "Nom convivial"
@@ -74,12 +71,12 @@ STRINGTABLE
     IDS_IMPORT_FILE_SUBTITLE "Spécifiez le fichier à importer."
     IDS_IMPORT_STORE_TITLE "Magasin de certificats"
     IDS_IMPORT_STORE_SUBTITLE "Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance."
-    IDS_IMPORT_FILTER_CERT "Certificat X.509 (*.cer ; *.crt)"
+    IDS_IMPORT_FILTER_CERT "Certificat X.509 (*.cer ; *.crt)"
-    IDS_IMPORT_FILTER_PFX "Échange d'informations personnelles (*.pfx ; *.p12)"
+    IDS_IMPORT_FILTER_PFX "Échange d'informations personnelles (*.pfx ; *.p12)"
     IDS_IMPORT_FILTER_CRL "Liste de révocation de certificats (*.crl)"
     IDS_IMPORT_FILTER_CTL "Liste de certificats de confiance (*.stl)"
     IDS_IMPORT_FILTER_SERIALIZED_STORE "Magasin de certificats sérialisés Microsoft (*.sst)"
-    IDS_IMPORT_FILTER_CMS "Messages CMS/PKCS #7 (*.spc ; *.p7b)"
+    IDS_IMPORT_FILTER_CMS "Messages CMS/PKCS #7 (*.spc ; *.p7b)"
     IDS_IMPORT_FILTER_ALL "Tous les fichiers (*.*)"
     IDS_IMPORT_EMPTY_FILE "Sélectionnez un fichier."
     IDS_IMPORT_BAD_FORMAT "Le format du fichier n'est pas reconnu. Sélectionnez un autre fichier."
@@ -107,23 +104,34 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Nom convivial"
     IDS_ALLOWED_PURPOSE_ALL "<Tous>"
     IDS_ALLOWED_PURPOSE_NONE "<Aucun>"
-    IDS_WARN_REMOVE_MY "Vous ne pourrez plus déchiffrer ou signer de messages avec ce certificat.\nVoulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_MY "Vous ne pourrez plus déchiffrer ou signer de messages avec ce certificat.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Vous ne pourrez plus déchiffrer ou signer de messages avec ces certificats.\nVoulez-vous réellement supprimer ces certificats ?"
+Voulez-vous réellement supprimer ce certificat ?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Vous ne pourrez plus chiffrer ou vérifier de signature de messages avec ce certificat.\nVoulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_PLURAL_MY "Vous ne pourrez plus déchiffrer ou signer de messages avec ces certificats.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Vous ne pourrez plus chiffrer ou vérifier de signature de messages avec ces certificats.\nVoulez-vous réellement supprimer ces certificats ?"
+Voulez-vous réellement supprimer ces certificats ?"
-    IDS_WARN_REMOVE_CA "Les certificats émis par cette autorité de certification ne seront plus considérés comme valables.\nVoulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Vous ne pourrez plus chiffrer ou vérifier de signature de messages avec ce certificat.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Les certificats émis par cette autorité de certification ne seront plus considérés comme valables.\nVoulez-vous réellement supprimer ces certificats ?"
+Voulez-vous réellement supprimer ce certificat ?"
-    IDS_WARN_REMOVE_ROOT "Les certificats émis par cette autorité de certification racine, ou par toute autorité de certification qu'elle valide, ne seront plus considérés comme valables.\nVoulez-vous réellement supprimer ce certificat racine de confiance ?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Vous ne pourrez plus chiffrer ou vérifier de signature de messages avec ces certificats.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Les certificats émis par ces autorités de certification racines, ou par toute autorité de certification qu'elles valident, ne seront plus considérés comme valables.\nVoulez-vous réellement supprimer ces certificats racines de confiance ?"
+Voulez-vous réellement supprimer ces certificats ?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Les logiciels signés par cet éditeur ne seront plus considérés comme valables.\nVoulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_CA "Les certificats émis par cette autorité de certification ne seront plus considérés comme valables.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Les logiciels signés par ces éditeurs ne seront plus considérés comme valables.\nVoulez-vous réellement supprimer ces certificats ?"
+Voulez-vous réellement supprimer ce certificat ?"
-    IDS_WARN_REMOVE_DEFAULT "Voulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_PLURAL_CA "Les certificats émis par cette autorité de certification ne seront plus considérés comme valables.\n\
-    IDS_WARN_REMOVE_PLURAL_DEFAULT "Voulez-vous réellement supprimer ces certificats ?"
+Voulez-vous réellement supprimer ces certificats ?"
+    IDS_WARN_REMOVE_ROOT "Les certificats émis par cette autorité de certification racine, ou par toute autorité de certification qu'elle valide, ne seront plus considérés comme valables.\n\
+Voulez-vous réellement supprimer ce certificat racine de confiance ?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Les certificats émis par ces autorités de certification racines, ou par toute autorité de certification qu'elles valident, ne seront plus considérés comme valables.\n\
+Voulez-vous réellement supprimer ces certificats racines de confiance ?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Les logiciels signés par cet éditeur ne seront plus considérés comme valables.\n\
+Voulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Les logiciels signés par ces éditeurs ne seront plus considérés comme valables.\n\
+Voulez-vous réellement supprimer ces certificats ?"
+    IDS_WARN_REMOVE_DEFAULT "Voulez-vous réellement supprimer ce certificat ?"
+    IDS_WARN_REMOVE_PLURAL_DEFAULT "Voulez-vous réellement supprimer ces certificats ?"
     IDS_CERT_MGR "Certificats"
     IDS_FRIENDLY_NAME_NONE "<Aucun>"
     IDS_PURPOSE_SERVER_AUTH "Prouve l'identité d'un ordinateur distant"
     IDS_PURPOSE_CLIENT_AUTH "Prouve votre identité à un ordinateur distant"
-    IDS_PURPOSE_CODE_SIGNING "Garantit que des logiciels proviennent bien d'un éditeur de logiciels donné\nProtège le logiciel contre toute altération après publication"
+    IDS_PURPOSE_CODE_SIGNING "Garantit que des logiciels proviennent bien d'un éditeur de logiciels donné\n\
+Protège le logiciel contre toute altération après publication"
     IDS_PURPOSE_EMAIL_PROTECTION "Protège les courriers électroniques"
     IDS_PURPOSE_IPSEC "Permet des communications sécurisées sur Internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Permet de signer des données avec l'heure courante"
@@ -134,7 +142,7 @@ STRINGTABLE
     IDS_PURPOSE_NT5 "Vérification des composants système de Windows"
     IDS_PURPOSE_OEM_WHQL "Vérification des composants système de Windows OEM"
     IDS_PURPOSE_EMBEDDED_NT "Vérification des composants système de Windows embarqué"
-    IDS_PURPOSE_ROOT_LIST_SIGNER "Signataire de la liste racine"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "Signataire de liste racine"
     IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordination conditionnelle"
     IDS_PURPOSE_KEY_RECOVERY "Recouvrement de clé"
     IDS_PURPOSE_DOCUMENT_SIGNING "Signature de documents"
@@ -152,7 +160,7 @@ STRINGTABLE
     IDS_EXPORT_FORMAT_SUBTITLE "Choisissez le format dans lequel le contenu sera sauvé."
     IDS_EXPORT_FILE_TITLE "Nom du fichier à exporter"
     IDS_EXPORT_FILE_SUBTITLE "Choisissez le nom du fichier dans lequel le contenu sera sauvé."
-    IDS_EXPORT_FILE_EXISTS "Le fichier spécifié existe déjà. Voulez-vous le remplacer ?"
+    IDS_EXPORT_FILE_EXISTS "Le fichier spécifié existe déjà. Voulez-vous le remplacer ?"
     IDS_EXPORT_FILTER_CERT "Binaire codé DER X.509 (*.cer)"
     IDS_EXPORT_FILTER_BASE64_CERT "Binaire codé Base64 X.509 (*.cer)"
     IDS_EXPORT_FILTER_CRL "Liste de révocation de certificats (*.crl)"
@@ -172,8 +180,8 @@ STRINGTABLE
     IDS_EXPORT_PASSWORD_TITLE "Entrez le mot de passe"
     IDS_EXPORT_PASSWORD_SUBTITLE "Vous pouvez protéger une clé privée par un mot de passe."
     IDS_EXPORT_PASSWORD_MISMATCH "Les mots de passe ne correspondent pas."
-    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Note : la clé privée de ce certificat n'a pu être ouverte."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Note : la clé privée de ce certificat n'a pu être ouverte."
-    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note : la clé privée de ce certificat n'est pas exportable."
+    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note : la clé privée de ce certificat n'est pas exportable."
 }
 
 IDD_GENERAL DIALOG 0, 0, 255, 236
@@ -182,18 +190,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Installer un certificat...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Installer un certificat...", IDC_ADDTOSTORE,73,216,86,14
+  PUSHBUTTON "&Déclaration de l'émetteur", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "&Déclaration de l'émetteur", IDC_ISSUERSTATEMENT,161,216,86,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -201,16 +205,13 @@ CAPTION "Détails"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Afficher :", -1, 6,11,33,14
+  LTEXT "&Afficher :", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 39,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "É&diter les propriétés...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Copier dans le fichier...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "É&diter les propriétés...", IDC_EDITPROPERTIES,83,216,80,14
-  PUSHBUTTON "&Copier dans le fichier...", IDC_EXPORT,167,216,80,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -218,11 +219,11 @@ CAPTION "Chemin de certification"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Chemin de &certification", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "Chemin de certification", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Voir le certificat", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Voir le certificat", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "É&tat du certificat :", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "É&tat du certificat :", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -234,8 +235,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Fermer", IDOK,77,216,83,14
+  PUSHBUTTON "Fermer", IDOK,73,216,85,14
-  PUSHBUTTON "&Infos complémentaires", IDC_CPS,164,216,83,14
+  PUSHBUTTON "&Infos complémentaires", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -243,28 +244,28 @@ CAPTION "Général"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Nom convivial :", -1, 6,14,60,14
+  LTEXT "&Nom convivial :", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Description :", -1, 6,32,60,14
+  LTEXT "&Description :", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Rôles du certificat", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Rôles du certificat", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "Activer &tous les rôles prévus pour ce certificat",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Désactiver tous les rôles prévus pour ce certificat",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "N'activer &que les rôles suivants pour ce certificat :",
+  AUTORADIOBUTTON "N'activer &que les rôles suivants pour ce certificat :",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "&Ajouter un rôle...", IDC_ADD_PURPOSE,180,194,64,14
+  PUSHBUTTON "&Ajouter un rôle...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
 CAPTION "Ajouter un rôle"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Adjoindre l'identifiant d'objet (OIS) au rôle de certificat à ajouter :",
+  LTEXT "Adjoindre l'identifiant d'objet (OIS) au rôle de certificat à ajouter :",
     -1, 6,6,190,28
   EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
   PUSHBUTTON "OK", IDOK, 33,48,60,14
@@ -272,14 +273,13 @@ BEGIN
 END
 
 IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "Sélectionner un magasin de certificats"
+CAPTION "Sélectionnez le magasin de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Sélectionnez le magasin de certificats à utiliser :", IDC_STORE_TEXT, 6,6,190,28
+  LTEXT "Sélectionnez le magasin de certificats à utiliser :", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Montrer les magasins physiques", IDC_SHOW_PHYSICAL_STORES, 6,102,117,14,
+  CHECKBOX "&Montrer les magasins physiques", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Annuler", IDCANCEL, 144,118,50,14
 END
@@ -288,56 +288,55 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Assistant d'importation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Bienvenue dans l'assistant d'importation de certificats", IDC_IMPORT_TITLE,
+  LTEXT "Bienvenue dans l'assistant d'importation de certificats", IDC_IMPORT_TITLE, 115,7,195,30
-    115,6,195,12
+  LTEXT "Cet assistant vous aide à importer des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un magasin de certificats à partir d'un fichier.\n\
-  LTEXT "Cet assistant vous aide à importer des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un magasin de certificats à partir d'un fichier.",
+\n\
-    -1, 115,22,195,25
+Un certificat peut être utilisé pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance.\n\
-  LTEXT "Un certificat peut être utilisé pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance.",
+\n\
-    -1, 115,56,195,49
+Pour continuer, cliquez sur Suivant.",
-  LTEXT "Pour continuer, cliquez sur Suivant.",
+    -1, 115,40,195,120
-    -1, 115,114,195,8
 END
 
-IDD_IMPORT_FILE DIALOG 0,0,317,143
+IDD_IMPORT_FILE DIALOG 0,0,317,178
-CAPTION "Assistant Importation de certificats"
+CAPTION "Assistant d'importation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Nom du fichier :", -1, 21,1,195,10
+  LTEXT "&Nom du fichier :", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "Parco&urir...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Parcou&rir...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
-  LTEXT "Remarque : les formats de fichiers suivants peuvent contenir plus d'un certificat, liste de révocation de certificats ou liste de certificats de confiance :",
+  LTEXT "Remarque : les formats de fichiers suivants peuvent contenir plus d'un certificat, liste de révocation de certificats ou liste de certificats de confiance :",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Échange d'informations personnelles - PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Magasin de certificats sérialisés Microsoft (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
-CAPTION "Assistant Importation de certificats"
+CAPTION "Assistant d'importation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine peut sélectionner automatiquement un magasin de certificats, ou vous pouvez spécifier l'emplacement des certificats.",
-    -1, 21,1,212,18
+    -1, 21,1,220,25
   AUTORADIOBUTTON "Sélectionner &automatiquement un magasin de certificats",
-    IDC_IMPORT_AUTO_STORE, 31,18,194,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "Placer tous les certificats dans le &magasin suivant :",
+  AUTORADIOBUTTON "Placer tous les certificats dans le &magasin suivant :",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,194,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Parcourir...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "Parcou&rir...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
-IDD_IMPORT_FINISH DIALOG 0,0,317,179
+IDD_IMPORT_FINISH DIALOG 0,0,317,178
-CAPTION "Assistant Importation de certificats"
+CAPTION "Assistant d'importation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Clôture de l'assistant d'importation de certificats", IDC_IMPORT_TITLE,
-    115,10,195,12
+    115,1,195,40
   LTEXT "Vous avez terminé avec succès l'assistant d'importation de certificats.",
-    -1, 115,31,195,18
+    -1, 115,33,195,24
-  LTEXT "Vous avez spécifié les paramètres suivants :",
+  LTEXT "Vous avez spécifié les paramètres suivants :",
     -1, 115,57,195,12
   CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
@@ -348,20 +347,17 @@ IDD_CERT_MGR DIALOG 0,0,335,270
 CAPTION "Certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Rôle prévu :", -1, 7,9,100,12
+  LTEXT "&Rôle prévu :", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importer...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Exporter...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Supprimer", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importer...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Avancé...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Exporter...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Supprimer", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Avancé...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Rôles prévus pour le certificat", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Détails...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Affichage", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Fermer", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -372,7 +368,7 @@ BEGIN
   GROUPBOX "Rôle du certificat", -1, 7,7,234,141, BS_GROUPBOX
   LTEXT "Sélectionnez un ou plusieurs rôles à afficher quand les options avancées sont sélectionnées.",
     -1, 14,18,220,16
-  LTEXT "&Rôles du certificat :", -1, 14,41,90,12, WS_TABSTOP
+  LTEXT "&Rôles du certificat :", -1, 14,41,90,12, WS_TABSTOP
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
     14,51,220,90
@@ -381,17 +377,16 @@ BEGIN
 END
 
 IDD_EXPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "Assistant d'exportation de certificats"
+CAPTION "Assistant Exportation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Bienvenue dans l'assistant d'exportation de certificats", IDC_EXPORT_TITLE,
+  LTEXT "Bienvenue dans l'assistant d'exportation de certificats", IDC_EXPORT_TITLE, 115,7,195,30
-    115,6,195,12
+  LTEXT "Cet assistant vous aide à exporter des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un fichier à partir d'un magasin de certificats.\n\
-  LTEXT "Cet assistant vous aide à exporter des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un fichier à partir d'un magasin de certificats.",
+\n\
-    -1, 115,22,195,25
+Un certificat peut être utilisé pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance.\n\
-  LTEXT "Un certificat peut être utilisé pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance.",
+\n\
-    -1, 115,56,195,49
+Pour continuer, cliquez sur Suivant.",
-  LTEXT "Pour continuer, cliquez sur Suivant.",
+    -1, 115,40,195,120
-    -1, 115,114,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
@@ -399,7 +394,7 @@ CAPTION "Assistant Exportation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Si vous choisissez d'exporter la clé privée, on vous demandera un mot de passe pour protéger la clé privée dans une page ultérieure.", -1, 21,1,195,25
-  LTEXT "Voulez-vous exporter la clé privée ?", -1, 21,27,195,10
+  LTEXT "Voulez-vous exporter la clé privée ?", -1, 21,27,195,10
   AUTORADIOBUTTON "&Oui, exporter la clé privée",
     IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Non, ne pas exporter la clé privée",
@@ -411,9 +406,9 @@ IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
 CAPTION "Assistant Exportation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Mot de passe :", -1, 21,1,195,10
+  LTEXT "&Mot de passe :", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Confirmez le mot de passe :", -1, 21,35,195,10
+  LTEXT "&Confirmez le mot de passe :", -1, 21,35,195,10
   EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
 END
 
@@ -421,45 +416,43 @@ IDD_EXPORT_FORMAT DIALOG 0,0,317,143
 CAPTION "Assistant Exportation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Sélectionnez le format à utiliser :", -1, 21,1,195,10
+  LTEXT "Sélectionnez le format à utiliser :", -1, 21,1,195,10
   AUTORADIOBUTTON "Binaire codé &DER X.509 (*.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "Binaire codé Ba&se64 X.509 (.cer) :",
+  AUTORADIOBUTTON "Binaire codé Ba&se64 X.509 (.cer) :",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,230,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "Échange d'informations &Personnelles - PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Inclure &tous les certificats dans le chemin de certification si possible",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,230,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Activer le chiffrement fort",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Effacer la clé privée si l'export a réussi",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
 CAPTION "Assistant Exportation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Nom du fichier :", -1, 21,1,195,10
+  LTEXT "&Nom du fichier :", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "Parco&urir...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Parcou&rir...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
-IDD_EXPORT_FINISH DIALOG 0,0,317,179
+IDD_EXPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Assistant Exportation de certificats"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Clôture de l'assistant d'exportation de certificats", IDC_EXPORT_TITLE,
-    115,10,195,12
+    115,1,195,40
   LTEXT "Vous avez terminé avec succès l'assistant d'exportation de certificats.",
-    -1, 115,31,195,18
+    -1, 115,33,195,24
-  LTEXT "Vous avez spécifié les paramètres suivants :",
+  LTEXT "Vous avez spécifié les paramètres suivants :",
     -1, 115,57,195,12
   CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,

reactos/dll/win32/cryptui/cryptui_It.rc

@@ -1,7 +1,7 @@
 /*
- * cryptui dll Italian resources
+ * cryptui dll resources
  *
- * Copyright 2010 Luca Bennati
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,17 +20,14 @@
 
 #include "cryptuires.h"
 
-/* UTF-8 */
+LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
     IDS_CERTIFICATE "Certificato"
     IDS_CERTIFICATEINFORMATION "Informazioni sul certificato"
     IDS_CERT_INFO_BAD_SIG "Questo certificato ha una firma non valida. Il certificato può essere stato alterato o corrotto."
-    IDS_CERT_INFO_UNTRUSTED_CA "Questo certificato root non è fidato. Per fidarsene, aggiungilo al deposito certificati root fidati del tuo sistema."
+    IDS_CERT_INFO_UNTRUSTED_CA "Questo certificato root non è fidato. Per fidarsene, aggiungilo al deposito certificati base fidati del tuo sistema."
     IDS_CERT_INFO_UNTRUSTED_ROOT "Impossibile convalidare questo certificato in un certificato root fidato."
     IDS_CERT_INFO_PARTIAL_CHAIN "Impossibile trovare l'emittente di questo certificato."
     IDS_CERT_INFO_BAD_PURPOSES "Impossibile verificare tutti i soggetti intesi di questo certificato."
@@ -58,8 +55,8 @@ STRINGTABLE
     IDS_FIELD_VALID_TO "Valido fino a"
     IDS_FIELD_SUBJECT "Soggetto"
     IDS_FIELD_PUBLIC_KEY "Chiave pubblica"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bit)"
-    IDS_PROP_HASH "SHA1 hash"
+    IDS_PROP_HASH "Hash SHA1"
     IDS_PROP_ENHKEY_USAGE "Uso delle chiavi avanzate (proprietà)"
     IDS_PROP_FRIENDLY_NAME "Nome amichevole"
     IDS_PROP_DESCRIPTION "Descrizione"
@@ -69,11 +66,11 @@ STRINGTABLE
     IDS_SELECT_STORE_TITLE "Seleziona il deposito certificati"
     IDS_SELECT_STORE "Prego selezionare il deposito certificati."
     IDS_IMPORT_WIZARD "Guida all'Importazione di Certificati"
-    IDS_IMPORT_TYPE_MISMATCH "Il file contiene oggetti che non match con i criteri dati. Selezionare un altro file."
+    IDS_IMPORT_TYPE_MISMATCH "Il file contiene oggetti che non corrisponde con i criteri dati. Selezionare un altro file."
     IDS_IMPORT_FILE_TITLE "File da importare"
     IDS_IMPORT_FILE_SUBTITLE "Specificare il file che vuoi importare."
     IDS_IMPORT_STORE_TITLE "Deposito certificati"
-    IDS_IMPORT_STORE_SUBTITLE "I depositi certificati sono collezioni di certificati, liste di revoca di certificati, e liste di fiducia di certificati."
+    IDS_IMPORT_STORE_SUBTITLE "I depositi certificati sono collezioni di certificati, liste di revoca di certificati e liste di fiducia di certificati."
     IDS_IMPORT_FILTER_CERT "Certificato X.509 (*.cer; *.crt)"
     IDS_IMPORT_FILTER_PFX "Scambio Informazioni Personali (*.pfx; *.p12)"
     IDS_IMPORT_FILTER_CRL "Lista Revoca Certificati (*.crl)"
@@ -92,61 +89,72 @@ STRINGTABLE
     IDS_IMPORT_CONTENT "Contenuto"
     IDS_IMPORT_CONTENT_CERT "Certificato"
     IDS_IMPORT_CONTENT_CRL "Lista Revoca Certificati"
-    IDS_IMPORT_CONTENT_CTL "Lista Fiducia Certificati"
+    IDS_IMPORT_CONTENT_CTL "Lista dei certificati fidati"
     IDS_IMPORT_CONTENT_CMS "Messaggio CMS/PKCS #7"
     IDS_IMPORT_CONTENT_PFX "Scambio Informazioni Personali"
-    IDS_IMPORT_CONTENT_STORE "Deposito Certificati"
+    IDS_IMPORT_CONTENT_STORE "Deposito certificati"
     IDS_IMPORT_SUCCEEDED "Importazione riuscita."
-    IDS_IMPORT_FAILED "Imposrtazione fallita."
+    IDS_IMPORT_FAILED "Importazione fallita."
     IDS_WIZARD_TITLE_FONT "Arial"
     IDS_PURPOSE_ALL "<Tutti>"
-    IDS_PURPOSE_ADVANCED "<Advanced Purposes>"
+    IDS_PURPOSE_ADVANCED "<Ragioni speciali>"
     IDS_SUBJECT_COLUMN "Emesso per"
     IDS_ISSUER_COLUMN "Emesso da"
     IDS_EXPIRATION_COLUMN "Data di scadenza"
     IDS_FRIENDLY_NAME_COLUMN "Nome amichevole"
     IDS_ALLOWED_PURPOSE_ALL "<Tutti>"
     IDS_ALLOWED_PURPOSE_NONE "<Nessuno>"
-    IDS_WARN_REMOVE_MY "Non sarai più in grado di decriptare messaggi con questo certificato, o di firmare messaggi con questo.\nSei sicuro di voler rimuovere questo certificato?"
+    IDS_WARN_REMOVE_MY "Non sarai più in grado di decriptare messaggi con questo certificato, o di firmare messaggi con questo.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Non sarai più in grado di decriptare messaggi con questi certificati, o di firmare messaggi con questi.\nSei sicuro di voler rimuovere questi certificati?"
+Sei sicuro di voler rimuovere questo certificato?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Non sarai più in grado di criptare messaggi con questo certificato, o di verificare messaggi con questo.\nSei sicuro di voler rimuovere questo certificato?"
+    IDS_WARN_REMOVE_PLURAL_MY "Non sarai più in grado di decriptare messaggi con questi certificati, o di firmare messaggi con questi.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Non sarai più in grado di criptare messaggi con questi certificati, o di verificare messaggi con questi.\nSei sicuro di voler rimuovere questi certificati?"
+Sei sicuro di voler rimuovere questi certificati?"
-    IDS_WARN_REMOVE_CA "I certificati emessi da questa autorità di certificazione non saranno più fidati.\nSei sicuro di voler rimuovere questi certificati?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Non sarai più in grado di criptare messaggi con questo certificato, o di verificare messaggi con questo.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "I certificati emessi da queste autorità di certificazione non saranno più fidati.\nSei sicuro di voler rimuovere questi certificati?"
+Sei sicuro di voler rimuovere questo certificato?"
-    IDS_WARN_REMOVE_ROOT "I certificati emessi da questa autorità di certificazione root, o qualsiasi altre autorità di certificati emesse da essa, non saranno più fidate.\nSei sicuro di voler rimuovere questo certificato root fidato?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Non sarai più in grado di criptare messaggi con questi certificati, o di verificare messaggi con questi.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "I certificati emessi da questa autorità di certificazione root, o qualsiasi altre autorità di certificati emesse da essa, non saranno più fidate.\nSei sicuro di voler rimuovere questi certificati root fidati?"
+Sei sicuro di voler rimuovere questi certificati?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software firmato da questo editore non sarà più fidato.\nSei sicuro di voler rimuovere questo certificato?"
+    IDS_WARN_REMOVE_CA "I certificati emessi da questa autorità di certificazione non saranno più fidati.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software firmato da questi editori non sarà più fidato.\nSei sicuro di voler rimuovere questi certificati?"
+Sei sicuro di voler rimuovere questi certificati?"
+    IDS_WARN_REMOVE_PLURAL_CA "I certificati emessi da queste autorità di certificazione non saranno più fidati.\n\
+Sei sicuro di voler rimuovere questi certificati?"
+    IDS_WARN_REMOVE_ROOT "I certificati emessi da questa autorità di certificazione root, o qualsiasi altre autorità di certificati emesse da essa, non saranno più fidate.\n\
+Sei sicuro di voler rimuovere questo certificato root fidato?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "I certificati emessi da questa autorità di certificazione root, o qualsiasi altre autorità di certificati emesse da essa, non saranno più fidate.\n\
+Sei sicuro di voler rimuovere questi certificati root fidati?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software firmato da questo editore non sarà più fidato.\n\
+Sei sicuro di voler rimuovere questo certificato?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software firmato da questi editori non sarà più fidato.\n\
+Sei sicuro di voler rimuovere questi certificati?"
     IDS_WARN_REMOVE_DEFAULT "Sei sicuro di voler rimuovere questo certificato?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Sei sicuro di voler rimuovere questi certificati?"
     IDS_CERT_MGR "Certificati"
     IDS_FRIENDLY_NAME_NONE "<Nessuno>"
     IDS_PURPOSE_SERVER_AUTH "Assicura l'identità di un computer remoto"
     IDS_PURPOSE_CLIENT_AUTH "Prova la tua identità ad un computer remoto"
-    IDS_PURPOSE_CODE_SIGNING "Assicura che il software venga dall'editore del software\nProtegge i software da alterazioni dopo la pubblicazione"
+    IDS_PURPOSE_CODE_SIGNING "Assicura che il software venga dall'editore del software\n\
+Protegge i software da alterazioni dopo la pubblicazione"
     IDS_PURPOSE_EMAIL_PROTECTION "Protegge messaggi e-mail"
     IDS_PURPOSE_IPSEC "Permette la comunicazione sicura tramite Internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Permette di firmare i dati con l'ora corrente"
     IDS_PURPOSE_CTL_USAGE_SIGNING "Ti permette di firmare digitalmente una lista di fiducia di certificati"
     IDS_PURPOSE_EFS "Permette di criptare i dati sul disco"
-    IDS_PURPOSE_EFS_RECOVERY "Recupero del file"
+    IDS_PURPOSE_EFS_RECOVERY "Recupero di file"
-    IDS_PURPOSE_WHQL "Verifica di Driver Hardware per Windows"
+    IDS_PURPOSE_WHQL "Verifica del Driver Hardware per Windows"
     IDS_PURPOSE_NT5 "Verifica del Componente di Sistema Windows"
     IDS_PURPOSE_OEM_WHQL "Verifica del Componente di Sistema Windows OEM"
     IDS_PURPOSE_EMBEDDED_NT "Verifica del Componente di Sistema Windows Embedded"
-    IDS_PURPOSE_ROOT_LIST_SIGNER "Firmatario Lista Root"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "Firmatario della lista base"
     IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordinazione qualificata"
     IDS_PURPOSE_KEY_RECOVERY "Recupero della chiave"
-    IDS_PURPOSE_DOCUMENT_SIGNING "Firma Documento"
+    IDS_PURPOSE_DOCUMENT_SIGNING "Firma del documento"
-    IDS_PURPOSE_LIFETIME_SIGNING "Firma Lifetime"
+    IDS_PURPOSE_LIFETIME_SIGNING "Firma vitalizia"
-    IDS_PURPOSE_DRM "Diritti Digitali"
+    IDS_PURPOSE_DRM "Diritti digitali"
     IDS_PURPOSE_LICENSES "Licenze del pacchetto di chiavi"
     IDS_PURPOSE_LICENSE_SERVER "Verifica del server delle licenze"
     IDS_PURPOSE_ENROLLMENT_AGENT "Agente di richiesta dei certificati"
     IDS_PURPOSE_SMARTCARD_LOGON "Logon con Smart Card"
     IDS_PURPOSE_CA_EXCHANGE "Archivio chiavi private"
     IDS_PURPOSE_KEY_RECOVERY_AGENT "Agente di recupero delle chiavi"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Servizio di Directory di replica e-mail"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Servizio directory di Risposta Email"
     IDS_EXPORT_WIZARD "Guida all'Esportazione del Certificato"
     IDS_EXPORT_FORMAT_TITLE "Formato di Esportazione"
     IDS_EXPORT_FORMAT_SUBTITLE "Scegli il formato nel quale il contenuto sarà salvato."
@@ -154,9 +162,9 @@ STRINGTABLE
     IDS_EXPORT_FILE_SUBTITLE "Specifica il nome del file nel quale il contenuto sarà salvato."
     IDS_EXPORT_FILE_EXISTS "File specificato esistene. Vuoi sostituirlo?"
     IDS_EXPORT_FILTER_CERT "Binario DER-Encoded X.509 (*.cer)"
-    IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)"
+    IDS_EXPORT_FILTER_BASE64_CERT "X.509 Base64-Encoded (*.cer)"
-    IDS_EXPORT_FILTER_CRL "Lista di Revoca di Certificati (*.crl)"
+    IDS_EXPORT_FILTER_CRL "Lista Revoca Certificati (*.crl)"
-    IDS_EXPORT_FILTER_CTL "Lista di Fiducia di Certificati (*.stl)"
+    IDS_EXPORT_FILTER_CTL "Lista Fiducia Certificati (*.stl)"
     IDS_EXPORT_FILTER_CMS "Messaggi CMS/PKCS #7 (*.p7b)"
     IDS_EXPORT_FILTER_PFX "Scambio Informazioni Personali (*.pfx)"
     IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Deposito certificati serializzato (*.sst)"
@@ -182,18 +190,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Installa Certificato...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Installa Certificato...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "&Annuncio dell'emittente", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "&Annuncio dell'emittente", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -202,15 +206,12 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Mostra:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "Modifica &Proprietà...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Copia su File...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "Modifica &Proprietà...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Copia su File...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -218,11 +219,11 @@ CAPTION "Percorso di certificazione"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "&Percorso di certificazione", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "Percorso di certificazione", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Vedi Certificato", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Vedi Certificato", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "&Stato del Certificato:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "&Stato del Certificato:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -234,8 +235,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "&Chiudi", IDOK,103,216,70,14
+  PUSHBUTTON "Chiudi", IDOK,73,216,85,14
-  PUSHBUTTON "Più %Informazioni", IDC_CPS,177,216,70,14
+  PUSHBUTTON "Più %Informazioni", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -244,20 +245,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nome amichevole:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Descrizione:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Soggetti del certificato", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Soggetti del certificato", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "&Abilita tutti i soggetti per questo certificato",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "D&isabilita tutti i soggetti per questo certificato",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Abilita &solo i seguenti soggetti per questo certificato:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "A&ggiungi Soggetto...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "A&ggiungi Soggetto...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -267,20 +268,19 @@ BEGIN
   LTEXT "Aggiungi l'identificatore oggetto (OID) per questo soggetto di certificato che desideri aggiungere:",
     -1, 6,6,190,28
   EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  PUSHBUTTON "OK", IDOK, 33,48,60,14
+  PUSHBUTTON "Ok", IDOK, 33,48,60,14
   PUSHBUTTON "Annulla", IDCANCEL, 100,48,60,14
 END
 
 IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "Seleziona il Deposito Certificati"
+CAPTION "Seleziona il deposito certificati"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Seleziona il deposito certificati che vuoi usare:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Mostra i depositi fisici", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Mostra i depositi fisici", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
+  PUSHBUTTON "Ok", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
-  PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Annulla", IDCANCEL, 144,118,50,14
 END
 
@@ -288,14 +288,13 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Guida all'Importazione di Certificati"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Benvenuto alla Guida all'Importazione di Certificati", IDC_IMPORT_TITLE,
+  LTEXT "Benvenuto alla Guida all'Importazione di Certificati", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "Questa guida ti aiuta a importare certificate, liste di revoca di certificati e liste di fiducia di certificati da un file in un deposito di certificati.\n\
-  LTEXT "Questa guida ti aiuta a importare certificati, liste di revoca di certificati, e liste di fiducia di certificati da un file ad un deposito certificati.",
+\n\
-    -1, 115,26,195,25
+Un certificato può essere usato per identificare te o il computer da cui stai comunicando. Può essere anche usato per l'autenticazione e per firmare messaggi. I depositi di certificati sono collezioni di certificati, liste di revoca di certificati e liste di fiducia di certificati.\n\
-  LTEXT "Un certificato può essere usato per identificare te o il computer da cui stai comunicando. Può essere anche usato per l'autenticazione, e per firmare messaggi. I depositi certificati sono collezioni di certificati, liste di revoca di certificati, e liste di fiducia di certificati.",
+\n\
-    -1, 115,56,195,40
+Per continuare, premere Avanti.",
-  LTEXT "Per continuare, clicca Avanti.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
@@ -304,15 +303,15 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Nome del &file:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Sfoglia...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "&Naviga", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Nota:  i seguenti formati di file potrebbero contenere più di un certificato, lista di revoca di certificati, o lista di fiducia di certificati:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Messaggio Crittografico con Sintassi Standard/Messaggi PKCS #7 (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Scambio di Informazioni Personali/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Deposito Certificati Serializzato Microsoft (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -320,13 +319,13 @@ CAPTION "Guida all'Importazione di Certificati"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine può selezionare automaticamente il deposito certificati, oppure puoi specificare una locazione per i certificati.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "Seleziona &automaticamente il deposito certificati",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Piazza tutti i certificati nel deposito seguente:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Sfoglia...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "&Naviga", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
@@ -349,19 +348,16 @@ CAPTION "Certificati"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Soggetto inteso:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importa...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Esporta...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Rimuovi...", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importa...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Avanzato...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Esporta...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Rimuovi", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Avanzato...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Soggetti intesi del certificato", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Vedi...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Visualizza", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Chiudi", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -376,7 +372,7 @@ BEGIN
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
     14,51,220,90
-  PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "Ok", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Annulla", IDCANCEL, 190,155,51,14
 END
 
@@ -384,14 +380,13 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Guida all'Esportazione del Certificato"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Benvenuto alla Guida all'Esportazione del Certificato", IDC_EXPORT_TITLE,
+  LTEXT "Benvenuto alla Guida all'Esportazione del Certificato", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "Questa guida ti aiuta a esportare certificate, liste di revoca di certificati e liste di fiducia di certificati da un deposito di certificati in un file.\n\
-  LTEXT "Questa guida ti aiuta ad esportare certificati, liste di revoca di certificati, e liste di fiducia di certificati da un deposito di certificati ad un file.",
+\n\
-    -1, 115,26,195,25
+Un certificato può essere usato per identificare te o il computer da cui stai comunicando. Può essere anche usato per l'autenticazione e per firmare messaggi. I depositi di certificati sono collezioni di certificati, liste di revoca di certificati e liste di fiducia di certificati.\n\
-  LTEXT "Un certificato può essere usato per identificare te o il computer dal quale stai comunicando. Può essere anche usato per l'autenticazione, e per firmare messaggi. I depositi di certificati sono collezioni di certificati, di liste di revoca di certificati, e di liste di fiducia di certificati.",
+\n\
-    -1, 115,56,195,40
+Per continuare, premere Avanti.",
-  LTEXT "Per continuare, clicca Avanti.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
@@ -422,33 +417,31 @@ CAPTION "Guida all'Esportazione del Certificato"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Seleziona il formato che vuoi usare:", -1, 21,1,195,10
-  AUTORADIOBUTTON "&DER-encoded X.509 (.cer)",
+  AUTORADIOBUTTON "X.509 &DER-encoded (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):",
+  AUTORADIOBUTTON "X.509 Ba&se64-encoded (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Messaggio &Crittografico con Sintassi Standard/Messaggio PKCS #7 (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Includi tutti i certificati nel percorso di certificazione se possibile",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "Scambia di Informazioni &Personali/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Incl&udi tutti i certificati nel percorso di certificazione se possibile",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Abilita Crittazione forte",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Elimina la chiave privata se l'esportazione riesce",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
 CAPTION "Guida all'Esportazione del Certificato"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Nome del file:", -1, 21,1,195,10
+  LTEXT "Nome del &file:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "%Sfoglia...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "&Naviga", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
 IDD_EXPORT_FINISH DIALOG 0,0,317,178
@@ -459,7 +452,7 @@ BEGIN
     115,1,195,40
   LTEXT "Hai completato con successo la Guida all'Esportazione del Certificato.",
     -1, 115,33,195,24
-  LTEXT "Hai specificato le seguenti impostazioni:",
+  LTEXT "Hai specificato le impostazioni seguenti:",
     -1, 115,57,195,12
   CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,

reactos/dll/win32/cryptui/cryptui_Ko.rc

@@ -1,8 +1,7 @@
 /*
- * cryptui dll Korean resources
+ * cryptui dll resources
-
+ *
  * Copyright 2008 Juan Lang
- * Copyright 2008 YunSong Hwang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,423 +24,435 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    IDS_CERTIFICATE "인증서"
+    IDS_CERTIFICATE "인증서"
-    IDS_CERTIFICATEINFORMATION "인증서 정보"
+    IDS_CERTIFICATEINFORMATION "인증서 정보"
-    IDS_CERT_INFO_BAD_SIG "이 인증서는 올바르지 않은 서명을 가지고 있습니다.  이 인증서는 아마도 고쳐졌거나 망가진 것같습니가"
+    IDS_CERT_INFO_BAD_SIG "이 인증서는 올바르지 않은 서명을 가지고 있습니다.  이 인증서는 아마도 고쳐졌거나 망가진 것같습니가"
-    IDS_CERT_INFO_UNTRUSTED_CA "이 루트 인증서는 신뢰 할 수 없습니다.  이것을 신뢰하려면,당신의 시스템의 신뢰된  루트 인증서 보관소에 추가하십시오."
+    IDS_CERT_INFO_UNTRUSTED_CA "이 루트 인증서는 신뢰 할 수 없습니다.  이것을 신뢰하려면,당신의 시스템의 신뢰된  루트 인증서 보관소에 추가하십시오."
-    IDS_CERT_INFO_UNTRUSTED_ROOT "이 인증서는 신뢰된 루트 인증서로 허가될 수 없습니다."
+    IDS_CERT_INFO_UNTRUSTED_ROOT "이 인증서는 신뢰된 루트 인증서로 허가될 수 없습니다."
-    IDS_CERT_INFO_PARTIAL_CHAIN "이 인증서의 발행자를 찾을 수 없습니다."
+    IDS_CERT_INFO_PARTIAL_CHAIN "이 인증서의 발행자를 찾을 수 없습니다."
-    IDS_CERT_INFO_BAD_PURPOSES "이 인증서의 모든 계획된 목적은 검증될 수 없습니다."
+    IDS_CERT_INFO_BAD_PURPOSES "이 인증서의 모든 계획된 목적은 검증될 수 없습니다."
-    IDS_CERT_INFO_PURPOSES "이 인증서는 다음의 목적으로 계획되어있습니다:"
+    IDS_CERT_INFO_PURPOSES "이 인증서는 다음의 목적으로 계획되어있습니다:"
-    IDS_SUBJECT_HEADING "발행대상: "
+    IDS_SUBJECT_HEADING "발행대상: "
-    IDS_ISSUER_HEADING "발행자: "
+    IDS_ISSUER_HEADING "발행자: "
-    IDS_VALID_FROM "유효기간(시작) "
+    IDS_VALID_FROM "유효기간(시작) "
-    IDS_VALID_TO "유효기간(끝) "
+    IDS_VALID_TO "유효기간(끝) "
-    IDS_CERTIFICATE_BAD_SIGNATURE "이 인증서는 올바르지 않은 서명을 가지고 있습니다."
+    IDS_CERTIFICATE_BAD_SIGNATURE "이 인증서는 올바르지 않은 서명을 가지고 있습니다."
-    IDS_CERTIFICATE_BAD_TIME "이 인증서는 만료되었거나 아직 유효하지 않습니다."
+    IDS_CERTIFICATE_BAD_TIME "이 인증서는 만료되었거나 아직 유효하지 않습니다."
-    IDS_CERTIFICATE_BAD_TIMENEST "이 인증서는 발행자가 정한 유효시간을 초과했습니다"
+    IDS_CERTIFICATE_BAD_TIMENEST "이 인증서는 발행자가 정한 유효시간을 초과했습니다"
-    IDS_CERTIFICATE_REVOKED "이 인증서는 발행자에 의하여 취소되었습니다."
+    IDS_CERTIFICATE_REVOKED "이 인증서는 발행자에 의하여 취소되었습니다."
-    IDS_CERTIFICATE_VALID "이 인증서는 올바릅니다.."
+    IDS_CERTIFICATE_VALID "이 인증서는 올바릅니다.."
-    IDS_FIELD "필드"
+    IDS_FIELD "필드"
-    IDS_VALUE "값"
+    IDS_VALUE "값"
-    IDS_FIELDS_ALL "<모두>"
+    IDS_FIELDS_ALL "<모두>"
-    IDS_FIELDS_V1 "오직 버젼 1 필드만"
+    IDS_FIELDS_V1 "오직 버젼 1 필드만"
-    IDS_FIELDS_EXTENSIONS "오직 확장만"
+    IDS_FIELDS_EXTENSIONS "오직 확장만"
-    IDS_FIELDS_CRITICAL_EXTENSIONS "오직 중요한 확장만"
+    IDS_FIELDS_CRITICAL_EXTENSIONS "오직 중요한 확장만"
-    IDS_FIELDS_PROPERTIES "오직 속성만"
+    IDS_FIELDS_PROPERTIES "오직 속성만"
-    IDS_FIELD_VERSION "버젼"
+    IDS_FIELD_VERSION "버젼"
-    IDS_FIELD_SERIAL_NUMBER "시리얼 번호"
+    IDS_FIELD_SERIAL_NUMBER "시리얼 번호"
-    IDS_FIELD_ISSUER "발행자"
+    IDS_FIELD_ISSUER "발행자"
-    IDS_FIELD_VALID_FROM "유효기간(시작)"
+    IDS_FIELD_VALID_FROM "유효기간(시작)"
-    IDS_FIELD_VALID_TO "유효기간(끝)"
+    IDS_FIELD_VALID_TO "유효기간(끝)"
-    IDS_FIELD_SUBJECT "제목"
+    IDS_FIELD_SUBJECT "제목"
-    IDS_FIELD_PUBLIC_KEY "공용 키"
+    IDS_FIELD_PUBLIC_KEY "공용 키"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d 비트)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! 비트)"
-    IDS_PROP_HASH "SHA1 해쉬"
+    IDS_PROP_HASH "SHA1 해쉬"
-    IDS_PROP_ENHKEY_USAGE "확장 키 사용 (속성)"
+    IDS_PROP_ENHKEY_USAGE "확장 키 사용 (속성)"
-    IDS_PROP_FRIENDLY_NAME "애칭"
+    IDS_PROP_FRIENDLY_NAME "애칭"
-    IDS_PROP_DESCRIPTION "설명"
+    IDS_PROP_DESCRIPTION "설명"
-    IDS_CERTIFICATE_PROPERTIES "인증서 속성"
+    IDS_CERTIFICATE_PROPERTIES "인증서 속성"
-    IDS_CERTIFICATE_PURPOSE_ERROR "폼 1,2,3,4에 하나의 OID를 입력하십시오"
+    IDS_CERTIFICATE_PURPOSE_ERROR "폼 1,2,3,4에 하나의 OID를 입력하십시오"
-    IDS_CERTIFICATE_PURPOSE_EXISTS "당신이 입력한 OID는 이미 존재합니다."
+    IDS_CERTIFICATE_PURPOSE_EXISTS "당신이 입력한 OID는 이미 존재합니다."
-    IDS_SELECT_STORE_TITLE "인증서 저장소 선택"
+    IDS_SELECT_STORE_TITLE "인증서 저장소 선택"
-    IDS_SELECT_STORE "인증서 저장소를 선택하십시오."
+    IDS_SELECT_STORE "인증서 저장소를 선택하십시오."
-    IDS_IMPORT_WIZARD "인증서 가져오기 마법사"
+    IDS_IMPORT_WIZARD "인증서 가져오기 마법사"
-    IDS_IMPORT_TYPE_MISMATCH "이 파일은 주어진 기존에 맞지 않는 객체를 포함하고 있습니다. 다른 파일을 선택하십시오."
+    IDS_IMPORT_TYPE_MISMATCH "이 파일은 주어진 기존에 맞지 않는 객체를 포함하고 있습니다. 다른 파일을 선택하십시오."
-    IDS_IMPORT_FILE_TITLE "가져올 파일"
+    IDS_IMPORT_FILE_TITLE "가져올 파일"
-    IDS_IMPORT_FILE_SUBTITLE "가져올 파일 선택."
+    IDS_IMPORT_FILE_SUBTITLE "가져올 파일 선택."
-    IDS_IMPORT_STORE_TITLE "인증서 보관소"
+    IDS_IMPORT_STORE_TITLE "인증서 보관소"
-    IDS_IMPORT_STORE_SUBTITLE "인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의 집합소입니다."
+    IDS_IMPORT_STORE_SUBTITLE "인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의 집합소입니다."
-    IDS_IMPORT_FILTER_CERT "X.509 인증서 (*.cer; *.crt)"
+    IDS_IMPORT_FILTER_CERT "X.509 인증서 (*.cer; *.crt)"
-    IDS_IMPORT_FILTER_PFX "개인 정보 교환 (*.pfx; *.p12)"
+    IDS_IMPORT_FILTER_PFX "개인 정보 교환 (*.pfx; *.p12)"
-    IDS_IMPORT_FILTER_CRL "인증소 파기 목록 (*.crl)"
+    IDS_IMPORT_FILTER_CRL "인증소 파기 목록 (*.crl)"
-    IDS_IMPORT_FILTER_CTL "인증서 신뢰 목록 (*.stl)"
+    IDS_IMPORT_FILTER_CTL "인증서 신뢰 목록 (*.stl)"
-    IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft 연속 인증서 보관소 (*.sst)"
+    IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft 연속 인증서 보관소 (*.sst)"
-    IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 메세지 (*.spc; *.p7b)"
+    IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 메세지 (*.spc; *.p7b)"
-    IDS_IMPORT_FILTER_ALL "모든 파일 (*.*)"
+    IDS_IMPORT_FILTER_ALL "모든 파일 (*.*)"
-    IDS_IMPORT_EMPTY_FILE "파일을 선택하십시오."
+    IDS_IMPORT_EMPTY_FILE "파일을 선택하십시오."
-    IDS_IMPORT_BAD_FORMAT "이 파일 형식은 인식할 수 없습니다. 다른 파일을 선택하십시오."
+    IDS_IMPORT_BAD_FORMAT "이 파일 형식은 인식할 수 없습니다. 다른 파일을 선택하십시오."
-    IDS_IMPORT_OPEN_FAILED "열수 없습니다 "
+    IDS_IMPORT_OPEN_FAILED "열수 없습니다 "
-    IDS_IMPORT_DEST_DETERMINED "프로그램에 의해 결정"
+    IDS_IMPORT_DEST_DETERMINED "프로그램에 의해 결정"
-    IDS_IMPORT_SELECT_STORE "보관소를 선택하십시오"
+    IDS_IMPORT_SELECT_STORE "보관소를 선택하십시오"
-    IDS_IMPORT_STORE_SELECTION "인증서 보관소가 선택됨"
+    IDS_IMPORT_STORE_SELECTION "인증서 보관소가 선택됨"
-    IDS_IMPORT_DEST_AUTOMATIC "자동으로 프로그램에 의해 결정"
+    IDS_IMPORT_DEST_AUTOMATIC "자동으로 프로그램에 의해 결정"
-    IDS_IMPORT_FILE "파일"
+    IDS_IMPORT_FILE "파일"
-    IDS_IMPORT_CONTENT "내용"
+    IDS_IMPORT_CONTENT "내용"
-    IDS_IMPORT_CONTENT_CERT "인증서"
+    IDS_IMPORT_CONTENT_CERT "인증서"
-    IDS_IMPORT_CONTENT_CRL "인증서 파기 목록"
+    IDS_IMPORT_CONTENT_CRL "인증서 파기 목록"
-    IDS_IMPORT_CONTENT_CTL "인증서 신뢰 목록"
+    IDS_IMPORT_CONTENT_CTL "인증서 신뢰 목록"
-    IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 메세지"
+    IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 메세지"
-    IDS_IMPORT_CONTENT_PFX "개인 정보 교환"
+    IDS_IMPORT_CONTENT_PFX "개인 정보 교환"
-    IDS_IMPORT_CONTENT_STORE "인증서 보관소"
+    IDS_IMPORT_CONTENT_STORE "인증서 보관소"
-    IDS_IMPORT_SUCCEEDED "가져오기 성공."
+    IDS_IMPORT_SUCCEEDED "가져오기 성공."
-    IDS_IMPORT_FAILED "가져오기 실패."
+    IDS_IMPORT_FAILED "가져오기 실패."
     IDS_WIZARD_TITLE_FONT "Arial"
-    IDS_PURPOSE_ALL "<모두>"
+    IDS_PURPOSE_ALL "<모두>"
-    IDS_PURPOSE_ADVANCED "<추가 용도>"
+    IDS_PURPOSE_ADVANCED "<추가 용도>"
-    IDS_SUBJECT_COLUMN "발행목적"
+    IDS_SUBJECT_COLUMN "발행목적"
-    IDS_ISSUER_COLUMN "발행자"
+    IDS_ISSUER_COLUMN "발행자"
-    IDS_EXPIRATION_COLUMN "만기일"
+    IDS_EXPIRATION_COLUMN "만기일"
-    IDS_FRIENDLY_NAME_COLUMN "애칭"
+    IDS_FRIENDLY_NAME_COLUMN "애칭"
-    IDS_ALLOWED_PURPOSE_ALL "<모두>"
+    IDS_ALLOWED_PURPOSE_ALL "<모두>"
-    IDS_ALLOWED_PURPOSE_NONE "<없음>"
+    IDS_ALLOWED_PURPOSE_NONE "<없음>"
-    IDS_WARN_REMOVE_MY "당신은 더 이상 이 인증서를 이용해서 메세지를 해독하거나,아니면 서명을 할 수 없을 것입니다.\n당신은 정말로 이 인증서를 제거하기를 원합니까?"
+    IDS_WARN_REMOVE_MY "당신은 더 이상 이 인증서를 이용해서 메세지를 해독하거나,아니면 서명을 할 수 없을 것입니다.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "당신은 더 이상 이 인증서다들를 이용해서 메세지를 해독하거나,아니면 서명을 할 수 없을 것입니다.\n당신은 정말로 이 인증서들를 제거하기를 원합니까??"
+당신은 정말로 이 인증서를 제거하기를 원합니까?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "당신은 더 이상 이 인증서를 이용해서 메세지를 암호하거나,아니면 서명된 것을 검증할 수 없을 것입니다.\n당신은 정말로 이 인증서를 제거하기를 원합니까?"
+    IDS_WARN_REMOVE_PLURAL_MY "당신은 더 이상 이 인증서다들를 이용해서 메세지를 해독하거나,아니면 서명을 할 수 없을 것입니다.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "당신은 더 이상 이 인증서들를 이용해서 메세지를 암호하거나,아니면 서명된 것을 검증할 수 없을 것입니다.\n당신은 정말로 이 인증서들를 제거하기를 원합니까?"
+당신은 정말로 이 인증서들를 제거하기를 원합니까??"
-    IDS_WARN_REMOVE_CA "이 인증 기관이 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n당신은 정말로 이 인증서를 제거하기를 원합니까?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "당신은 더 이상 이 인증서를 이용해서 메세지를 암호하거나,아니면 서명된 것을 검증할 수 없을 것입니다.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "이 인증 기관이 발급한 인증서들를 더 이상 신뢰할 수 없을 것입니다.\n당신은 정말로 이 인증서들를 제거하기를 원합니까?"
+당신은 정말로 이 인증서를 제거하기를 원합니까?"
-    IDS_WARN_REMOVE_ROOT "이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n당신은 정말로 이 신뢰된 루트인증서를 제거하기를 원합니까?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "당신은 더 이상 이 인증서들를 이용해서 메세지를 암호하거나,아니면 서명된 것을 검증할 수 없을 것입니다.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n당신은 정말로 이 신뢰된 루트인증서들를 제거하기를 원합니까?"
+당신은 정말로 이 인증서들를 제거하기를 원합니까?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "이 발행자에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n당신은 정말로 이 인증서를 제거하기를 원합니까?"
+    IDS_WARN_REMOVE_CA "이 인증 기관이 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "이 발행자들에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n당신은 정말로 이 인증서들를 제거하기를 원합니까?"
+당신은 정말로 이 인증서를 제거하기를 원합니까?"
-    IDS_WARN_REMOVE_DEFAULT "이 인증거를 제거하기를 원합니까?"
+    IDS_WARN_REMOVE_PLURAL_CA "이 인증 기관이 발급한 인증서들를 더 이상 신뢰할 수 없을 것입니다.\n\
-    IDS_WARN_REMOVE_PLURAL_DEFAULT "이 인증서들를 제거하기를 원합니까?"
+당신은 정말로 이 인증서들를 제거하기를 원합니까?"
-    IDS_CERT_MGR "인증서"
+    IDS_WARN_REMOVE_ROOT "이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n\
-    IDS_FRIENDLY_NAME_NONE "<없음>"
+당신은 정말로 이 신뢰된 루트인증서를 제거하기를 원합니까?"
-    IDS_PURPOSE_SERVER_AUTH "원격 컴퓨터의 동일성 보증"
+    IDS_WARN_REMOVE_PLURAL_ROOT "이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n\
-    IDS_PURPOSE_CLIENT_AUTH "당신의 신원을 원격컴퓨터로 인증"
+당신은 정말로 이 신뢰된 루트인증서들를 제거하기를 원합니까?"
-    IDS_PURPOSE_CODE_SIGNING "소프트웨어 발행자로부터 온 소프트웨어 보증\n발행된 후의 소프트웨어를 개조로부터 보호"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "이 발행자에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n\
-    IDS_PURPOSE_EMAIL_PROTECTION "전자우편 메시지 보호"
+당신은 정말로 이 인증서를 제거하기를 원합니까?"
-    IDS_PURPOSE_IPSEC "인터넷을 통한 보안 통신 허용"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "이 발행자들에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n\
-    IDS_PURPOSE_TIMESTAMP_SIGNING "현재 시간에 따른 서명 허용"
+당신은 정말로 이 인증서들를 제거하기를 원합니까?"
-    IDS_PURPOSE_CTL_USAGE_SIGNING "신뢰할 수 있는 증명서 목록에 전자 서명 허용"
+    IDS_WARN_REMOVE_DEFAULT "이 인증거를 제거하기를 원합니까?"
-    IDS_PURPOSE_EFS "디스크에 데이타 암호화 허용"
+    IDS_WARN_REMOVE_PLURAL_DEFAULT "이 인증서를 제거하기를 원합니까?"
-    IDS_PURPOSE_EFS_RECOVERY "파일 복구"
+    IDS_CERT_MGR "인증서"
-    IDS_PURPOSE_WHQL "윈도우즈 하드웨어 드라이버 확인"
+    IDS_FRIENDLY_NAME_NONE "<없음>"
-    IDS_PURPOSE_NT5 "윈도우즈 시스템 컴포넌트 확인"
+    IDS_PURPOSE_SERVER_AUTH "원격 컴퓨터의 동일성 보증"
-    IDS_PURPOSE_OEM_WHQL "OEM 윈도우즈 시스템 컴포넌트 확인"
+    IDS_PURPOSE_CLIENT_AUTH "당신의 신원을 원격컴퓨터로 인증"
-    IDS_PURPOSE_EMBEDDED_NT "임베디드 윈도우즈 시스템 컴포넌트 확인"
+    IDS_PURPOSE_CODE_SIGNING "소프트웨어 발행자로부터 온 소프트웨어 보증\n\
-    IDS_PURPOSE_ROOT_LIST_SIGNER "루트 목록 서명자"
+발행된 후의 소프트웨어를 개조로부터 보호"
-    IDS_PURPOSE_QUALIFIED_SUBORDINATION "자격있는 종속"
+    IDS_PURPOSE_EMAIL_PROTECTION "전자우편 메시지 보호"
-    IDS_PURPOSE_KEY_RECOVERY "키 복구"
+    IDS_PURPOSE_IPSEC "인터넷을 통한 보안 통신 허용"
-    IDS_PURPOSE_DOCUMENT_SIGNING "문서 서명"
+    IDS_PURPOSE_TIMESTAMP_SIGNING "현재 시간에 따른 서명 허용"
-    IDS_PURPOSE_LIFETIME_SIGNING "유효기간"
+    IDS_PURPOSE_CTL_USAGE_SIGNING "신뢰할 수 있는 증명서 목록에 전자 서명 허용"
-    IDS_PURPOSE_DRM "디지털 권리"
+    IDS_PURPOSE_EFS "디스크에 데이타 암호화 허용"
-    IDS_PURPOSE_LICENSES "키 팩 라이센스"
+    IDS_PURPOSE_EFS_RECOVERY "파일 복구"
-    IDS_PURPOSE_LICENSE_SERVER "라이센스 서버 확인"
+    IDS_PURPOSE_WHQL "윈도우즈 하드웨어 드라이버 검증"
-    IDS_PURPOSE_ENROLLMENT_AGENT "인증서 요청 에이전트"
+    IDS_PURPOSE_NT5 "윈도우즈 시스템 구성요소 검증"
-    IDS_PURPOSE_SMARTCARD_LOGON "스마트 카드 로그온"
+    IDS_PURPOSE_OEM_WHQL "OEM 윈도우즈 시스템 구성요소 검증"
-    IDS_PURPOSE_CA_EXCHANGE "사적 키 보관소"
+    IDS_PURPOSE_EMBEDDED_NT "임베디드 윈도우즈 시스템 컴포넌트 확인"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "키 복구 에이전트"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "루트 목록 서명자"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "디렉토리 서비스 전자우편 복제"
+    IDS_PURPOSE_QUALIFIED_SUBORDINATION "자격있는 종속"
-    IDS_EXPORT_WIZARD "인증서 내보내기 마법사"
+    IDS_PURPOSE_KEY_RECOVERY "키 복구"
-    IDS_EXPORT_FORMAT_TITLE "내보낼 형식"
+    IDS_PURPOSE_DOCUMENT_SIGNING "문서 서명"
-    IDS_EXPORT_FORMAT_SUBTITLE "내용을 저장할 형식 선택."
+    IDS_PURPOSE_LIFETIME_SIGNING "유효기간"
-    IDS_EXPORT_FILE_TITLE "내보낼 파일이름"
+    IDS_PURPOSE_DRM "디지털 저작권"
-    IDS_EXPORT_FILE_SUBTITLE "내용을 저장할 파일 이름 지정."
+    IDS_PURPOSE_LICENSES "키 팩 라이센스"
-    IDS_EXPORT_FILE_EXISTS "지정된 파일은 이미 존재합니다.덮어 쓰시겠습니까?"
+    IDS_PURPOSE_LICENSE_SERVER "라이센스 서버 확인"
-    IDS_EXPORT_FILTER_CERT "DER-암호화된 바이너리 X.509 (*.cer)"
+    IDS_PURPOSE_ENROLLMENT_AGENT "인증 요구 관리자"
-    IDS_EXPORT_FILTER_BASE64_CERT "Base64-암호화된 X.509 (*.cer)"
+    IDS_PURPOSE_SMARTCARD_LOGON "스마트 카드 로그인"
-    IDS_EXPORT_FILTER_CRL "인증서 폐기 목록 (*.crl)"
+    IDS_PURPOSE_CA_EXCHANGE "사적 키 보관소"
-    IDS_EXPORT_FILTER_CTL "인증서 신뢰 목록 (*.stl)"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "키 복구 관리자"
-    IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 메세지 (*.p7b)"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "디렉토리 서비스 이메일 응답"
-    IDS_EXPORT_FILTER_PFX "개인 정보 교환 (*.pfx)"
+    IDS_EXPORT_WIZARD "인증서 내보내기 마법사"
-    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "나열된 인증서 저장소 (*.sst)"
+    IDS_EXPORT_FORMAT_TITLE "내보낼 형식"
-    IDS_EXPORT_FORMAT "파일 형식"
+    IDS_EXPORT_FORMAT_SUBTITLE "내용을 저장할 형식 선택."
-    IDS_EXPORT_INCLUDE_CHAIN "인증 경로에 있는 모든 인증서 포함"
+    IDS_EXPORT_FILE_TITLE "내보낼 파일이름"
-    IDS_EXPORT_KEYS "내보낼 키"
+    IDS_EXPORT_FILE_SUBTITLE "내용을 저장할 파일 이름 지정."
-    IDS_YES "예"
+    IDS_EXPORT_FILE_EXISTS "지정된 파일은 이미 존재합니다.덮어 쓰시겠습니까?"
-    IDS_NO "아니오"
+    IDS_EXPORT_FILTER_CERT "DER-암호화된 바이너리 X.509 (*.cer)"
-    IDS_EXPORT_SUCCEEDED "내보내기 성공."
+    IDS_EXPORT_FILTER_BASE64_CERT "Base64-암호화된 X.509 (*.cer)"
-    IDS_EXPORT_FAILED "내보내기 실패."
+    IDS_EXPORT_FILTER_CRL "인증소 파기 목록 (*.crl)"
-    IDS_EXPORT_PRIVATE_KEY_TITLE "내보낼 개인 키"
+    IDS_EXPORT_FILTER_CTL "인증서 신뢰 목록 (*.stl)"
-    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "이 인증서는  인증서를 내보낼 때 같이 나갈 개인키를 포함하고 있습니다."
+    IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 메세지 (*.p7b)"
-    IDS_EXPORT_PASSWORD_TITLE "암호 입력"
+    IDS_EXPORT_FILTER_PFX "개인 정보 교환 (*.pfx)"
-    IDS_EXPORT_PASSWORD_SUBTITLE "이 개인키는 아마도 암호로 보호되어있는 것 같습니다."
+    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "나열된 인증서 저장소 (*.sst)"
-    IDS_EXPORT_PASSWORD_MISMATCH "이 암호는 맞지 않습니다."
+    IDS_EXPORT_FORMAT "파일 형식"
-    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "주의: 이 인증서를 위한 개인 키를 열 수 없습니다."
+    IDS_EXPORT_INCLUDE_CHAIN "인증 경로에 있는 모든 인증서 포함"
-    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "주의: 이 인증서를 위한 개인 키를 내보낼 수 없습니다."
+    IDS_EXPORT_KEYS "내보낼 키"
-
+    IDS_YES "예"
+    IDS_NO "아니오"
+    IDS_EXPORT_SUCCEEDED "내보내기 성공."
+    IDS_EXPORT_FAILED "내보내기 실패."
+    IDS_EXPORT_PRIVATE_KEY_TITLE "내보낼 개인 키"
+    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "이 인증서는  인증서를 내보낼 때 같이 나갈 개인키를 포함하고 있습니다."
+    IDS_EXPORT_PASSWORD_TITLE "암호 입력"
+    IDS_EXPORT_PASSWORD_SUBTITLE "이 개인키는 아마도 암호로 보호되어있는 것 같습니다."
+    IDS_EXPORT_PASSWORD_MISMATCH "이 암호는 맞지 않습니다."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "주의: 이 인증서를 위한 개인 키를 열 수 없습니다."
+    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "주의: 이 인증서를 위한 개인 키를 내보낼 수 없습니다."
 }
 
 IDD_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "일반"
+CAPTION "일반"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "인증서 설치(&I)...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "인증서 설치(&I)...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "발행자 설명(&S)", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "발행자 설명(&S)", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
-CAPTION "자세히"
+CAPTION "세부사항"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "표시(&S):", -1, 6,12,40,14
+  LTEXT "표시(&S):", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "속성 편집(&E)...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "파일로 복사(&C)...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "속성 편집(&E)...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "파일로 복사(&C)...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
-CAPTION "인증서 경로"
+CAPTION "인증서 경로"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "인증서 경로(&P)", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "인증서 경로", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "인증서 보기(&V)", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "인증서 보기(&V)", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "인증서 상태(&S):", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "인증서 상태(&S):", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
 
 IDD_USERNOTICE DIALOG 0, 0, 255, 256
-CAPTION "거부"
+CAPTION "거부"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "닫기", IDOK,103,216,70,14
+  PUSHBUTTON "닫기", IDOK,73,216,85,14
-  PUSHBUTTON "추가 정보(&I)", IDC_CPS,177,216,70,14
+  PUSHBUTTON "추가 정보(&I)", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "일반"
+CAPTION "일반"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "애칭(&F):", -1, 6,14,60,14
+  LTEXT "애칭(&F):", -1, 6,14,60,14
-	EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
-	LTEXT "설명(&D):", -1, 6,32,60,14
+  LTEXT "설명(&D):", -1, 6,32,60,14
-	EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-	GROUPBOX "인증서 용도", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "인증서 용도", -1,6,48,245,185, BS_GROUPBOX
-	AUTORADIOBUTTON "인증서를 모든 용도로 사용 가능(&E)",
+  AUTORADIOBUTTON "인증서를 모든 용도로 사용 가능(&E)",
-	IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
-	AUTORADIOBUTTON "인증서를 모든 용도로 사용하지 않음(&I)",
+  AUTORADIOBUTTON "인증서를 모든 용도로 사용하지 않음(&I)",
-	IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
-	AUTORADIOBUTTON "인증서를 오직 다음의 용도로만 사용(&O):",
+  AUTORADIOBUTTON "인증서를 오직 다음의 용도로만 사용(&O):",
-	IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
-	CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
+  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
-	LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,24,100,220,90
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-	PUSHBUTTON "용도 추가(&)...", IDC_ADD_PURPOSE,184,194,60,14
+    24,100,220,106
+  PUSHBUTTON "용도 추가(&)...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
-CAPTION "용도 추가"
+CAPTION "용도 추가"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "추가하고자 하는 인증서 용도의 객체 식별자(OID) 추가:",-1, 6,6,190,28
+  LTEXT "추가하고자 하는 인증서 용도의 객체 식별자(OID) 추가:",
-	EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+    -1, 6,6,190,28
-	PUSHBUTTON "확인", IDOK, 33,48,60,14
+  EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-	PUSHBUTTON "취소", IDCANCEL, 100,48,60,14
+  PUSHBUTTON "확인", IDOK, 33,48,60,14
+  PUSHBUTTON "취소", IDCANCEL, 100,48,60,14
 END
 
 IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "인증서 저장소 선택"
+CAPTION "인증서 저장소 선택"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "사용하고자 하는 인증서 저장소를 선택하십시오:", IDC_STORE_TEXT, 6,6,190,28
+  LTEXT "사용하고자 하는 인증서 저장소를 선택하십시오:", IDC_STORE_TEXT, 6,6,190,28
-	CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,6,28,188,70
+  CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
-	CHECKBOX "물리적 저장소 보여주기(&S)", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,BS_AUTOCHECKBOX|WS_TABSTOP
+    6,28,188,70
-	PUSHBUTTON "확인", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
+  CHECKBOX "물리적 저장소 보여주기(&S)", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-	PUSHBUTTON "취소", IDCANCEL, 144,118,50,14
+  PUSHBUTTON "확인", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "취소", IDCANCEL, 144,118,50,14
 END
 
 IDD_IMPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "인증서 가져오기 마법사"
+CAPTION "인증서 가져오기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "인증서 가져오기 마법사에 온 것을 환영합니다", IDC_IMPORT_TITLE,115,7,195,12
+  LTEXT "인증서 가져오기 마법사에 온 것을 환영합니다", IDC_IMPORT_TITLE, 115,7,195,30
-	LTEXT "이 마법사는 당신이 파일로부터 인증서,인증서 파기 목록,인증서 신뢰 목록을 인증서 보관소에 가져오는 것을 도와줍니다.",-1, 115,26,195,25
+  LTEXT "이 마법사는 당신이 인증서,인증서 폐기 목록을 가져오는 데 도움을 주고,파일에서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n\
-	LTEXT "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다.  또한  메세지에 사인하고 인증하는 데도 사용됩니다. 인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의 저장소입니다.",-1, 115,56,195,40
+\n\
-	LTEXT "계속하려면, 다음을 클릭하십시오.",-1, 115,103,195,8
+이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다. 또한  메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n\
+\n\
+계속하려면,다음을 클릭하십시오.",
+    -1, 115,40,195,120
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
-CAPTION "인증서 가져오기 마법사"
+CAPTION "인증서 가져오기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "파일 이름(&F):", -1, 21,1,195,10
+  LTEXT "파일 이름(&F):", -1, 21,1,195,10
-	EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-	PUSHBUTTON "찾기(&R)...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "찾기(&R)...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
-	LTEXT "주의:  이 파일 형식은 아마도 하나 이상의 인증서,인증서 파기 목록,인증서 신뢰 목록을 가지고 있을 수 있습니다:", -1, 21,26,265,16
+  LTEXT "주의:  이 파일 형식은 아마도 하나 이상의 인증서,인증서 파기 목록,인증서 신뢰 목록을 가지고 있을 수 있습니다:",
-	LTEXT "암호화 메세지 문법 표준/PKCS #7 메시지 (.p7b)",-1, 31,49,265,10
+    -1, 21,30,265,16
-	LTEXT "개인 정보 교환/PKCS #12 (.pfx, .p12)",-1, 31,64,265,10
+  LTEXT "암호화 메세지 문법 표준/PKCS #7 메시지 (.p7b)",
-	LTEXT "Microsoft 연속 인증서 보관소 (.sst)",-1, 31,79,265,10
+    -1, 31,53,265,10
+  LTEXT "개인 정보 교환/PKCS #12 (.pfx, .p12)",
+    -1, 31,68,265,10
+  LTEXT "Microsoft 연속 인증서 보관소 (.sst)",
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
-CAPTION "인증서 가져오기 마법사"
+CAPTION "인증서 가져오기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Wine이 자동으로 인증서 저장소를 선택하거나, 아니면 직접 저장할 곳을 선택할 수 있습니다.", -1, 21,1,195,20
+  LTEXT "Wine이 자동으로 인증서 저장소를 선택하거나, 아니면 직접 저장할 곳을 선택할 수 있습니다.",
-	AUTORADIOBUTTON "자동으로 인증서 저장소 선택(&A)",IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    -1, 21,1,220,25
-	AUTORADIOBUTTON "다음 저장소에 모든 인증서 저장(&P):",IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "자동으로 인증서 저장소 선택(&A)",
-	EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-	PUSHBUTTON "찾기(&R)...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  AUTORADIOBUTTON "다음 저장소에 모든 인증서 저장(&P):",
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
+  PUSHBUTTON "찾기(&R)...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
-CAPTION "인증서 가져오기 마법사"
+CAPTION "인증서 가져오기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "인증서 가져오기 마법사 마치는 중", IDC_IMPORT_TITLE,115,1,195,40
+  LTEXT "인증서 가져오기 마법사 마치는 중", IDC_IMPORT_TITLE,
-	LTEXT "당신은 인증서 가져오기 마법사를 마치는데 성공했습니다.",-1, 115,33,195,24
+    115,1,195,40
-	LTEXT "당신은 다음 설정을 지정했습니다:",-1, 115,57,195,12
+  LTEXT "당신은 인증서 가져오기 마법사를 마치는데 성공했습니다.",
-	CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
+    -1, 115,33,195,24
-	LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+  LTEXT "당신은 다음 설정을 지정했습니다:",
+    -1, 115,57,195,12
+  CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
+    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
     115,67,174,100
 END
 
 IDD_CERT_MGR DIALOG 0,0,335,270
-CAPTION "인증서"
+CAPTION "인증서"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "지정된 용도(&N):", -1, 7,9,100,12
+  LTEXT "지정된 용도(&N):", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "불러오기(&I)...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "내보내기(&E)...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "제거(&R)", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "불러오기(&I)...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "추가(&A)...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "내보내기(&E)...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
+  GROUPBOX "인증서 지정 용도", -1,7,194,321,47, BS_GROUPBOX
-  PUSHBUTTON "제거하기(&R)", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "추가(&A)...", IDC_MGR_ADVANCED, 277,172,51,14
+  PUSHBUTTON "보기(&V)", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
-  GROUPBOX "인증서 지정 용도", -1,7,194,321,47, BS_GROUPBOX
+  PUSHBUTTON "닫기(&C)", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
-  PUSHBUTTON "보기(&V)...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
-  PUSHBUTTON "닫기(&C)", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
 IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
-CAPTION "추가 옵션"
+CAPTION "추가 옵션"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "인증서 용도", -1, 7,7,234,141, BS_GROUPBOX
+  GROUPBOX "인증서 용도", -1, 7,7,234,141, BS_GROUPBOX
-  LTEXT "추가 용도가 선택되었을 때 나타나는 하나나 다수의 용도 선택.",
+  LTEXT "추가 용도가 선택되었을 때 나타나는 하나나 다수의 용도 선택.",
     -1, 14,18,220,16
-  LTEXT "인증서 용도(&C):", -1, 14,41,90,12, WS_TABSTOP
+  LTEXT "인증서 용도(&C):", -1, 14,41,90,12, WS_TABSTOP
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
     14,51,220,90
-  PUSHBUTTON "확인", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "확인", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
-  PUSHBUTTON "취소", IDCANCEL, 190,155,51,14
+  PUSHBUTTON "취소", IDCANCEL, 190,155,51,14
 END
 
-
 IDD_EXPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "인증서 내보내기 마법사"
+CAPTION "인증서 내보내기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "인증서 내보내기 마법사에 오신 것을 환영합니다", IDC_EXPORT_TITLE,
+  LTEXT "인증서 내보내기 마법사에 오신 것을 환영합니다", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "이 마법사는 당신이 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 신뢰 목록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍니다.\n\
-  LTEXT "이 마법사는 인증서,인증서 폐기 목록,인증서 신뢰 목록을 인증서 저장소로부터 파일로 내보내는 것을 도와줄겁니다.",
+\n\
-    -1, 115,26,195,25
+이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다. 또한  메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n\
-  LTEXT " 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다.  또한  메세지에 사인하고 인증하는 데도 사용됩니다. 인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의 저장소입니다..",
+\n\
-    -1, 115,56,195,40
+계속 하려면, 다음을 클릭하십시오.",
-  LTEXT "계속 하실려면, <다음>을 클릭하십시오.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
-CAPTION "인증서 내보내기 마법사"
+CAPTION "인증서 내보내기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "당신이  개인 키를 내보내기를 선택하면, 당신은 다음 페이지에서 개인 키를 보호할 암호를 입력하게 될 것입니다.", -1, 21,1,195,25
+  LTEXT "당신이  개인 키를 내보내기를 선택하면, 당신은 다음 페이지에서 개인 키를 보호할 암호를 입력하게 될 것입니다.", -1, 21,1,195,25
-	LTEXT "개인 키를 내보내기를 원합니까?", -1, 21,27,195,10
+  LTEXT "개인 키를 내보내기를 원합니까?", -1, 21,27,195,10
-	AUTORADIOBUTTON "예(&Y), 개인 키 내보내기",
+  AUTORADIOBUTTON "예(&Y), 개인 키 내보내기",
-	IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-	AUTORADIOBUTTON "아니오(&O), 개인 키 안 내보내기",
+  AUTORADIOBUTTON "아니오(&O), 개인 키 안 내보내기",
-	IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON
-	LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24
+  LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24
 END
 
 IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
-CAPTION "인증서 내보내기 마법사"
+CAPTION "인증서 내보내기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-LTEXT "암호(&P):", -1, 21,1,195,10
+  LTEXT "암호(&P):", -1, 21,1,195,10
-EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-LTEXT "암호 확인(&C):", -1, 21,35,195,10
+  LTEXT "암호 확인(&C):", -1, 21,35,195,10
-EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
 END
 
 IDD_EXPORT_FORMAT DIALOG 0,0,317,143
-CAPTION "인증서 내보내기 마법사"
+CAPTION "인증서 내보내기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "사용할 파일 형식 선택:", -1, 21,1,195,10
+  LTEXT "사용할 파일 형식 선택:", -1, 21,1,195,10
-  AUTORADIOBUTTON "&DER-암호화된 X.509 (.cer)",
+  AUTORADIOBUTTON "&DER-암호화된 X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "Ba&se64-암호화된 X.509 (.cer):",
+  AUTORADIOBUTTON "Ba&se64-암호화된 X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "암호 메시지 문법 표준/PKCS #7 메시지(&C) (.p7b)",
+  AUTORADIOBUTTON "암호 메시지 문법 표준/PKCS #7 메시지(&C) (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
-  CHECKBOX "가능한 인증서 경로에 있는 모든 인증서 포함(&I)",
+  CHECKBOX "가능한 인증서 경로에 있는 모든 인증서 포함(&I)",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-  AUTORADIOBUTTON "개인 정보 교환(&P)/PKCS #12 (.pfx)",
+  AUTORADIOBUTTON "개인 정보 교환(&P)/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
-  CHECKBOX "가능한 인증서 경로에 있는 모든 인증서 포함(&U)",
+  CHECKBOX "가능한 인증서 경로에 있는 모든 인증서 포함(&U)",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-  CHECKBOX "강한 암호화 가능(&E)",
+  CHECKBOX "강한 암호화 가능(&E)",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  CHECKBOX "내보내기가 성공하면 개인 키 지우기(&K)",
-  CHECKBOX "내보내기가 성공하면 개인 키 지우기(&K)",
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
-CAPTION "인증서 내보내기 마법사"
+CAPTION "인증서 내보내기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "파일 이름(&F):", -1, 21,1,195,10
+  LTEXT "파일 이름(&F):", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "찾기(&R)...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "찾기(&R)...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
 IDD_EXPORT_FINISH DIALOG 0,0,317,178
-CAPTION "인증서 내보내기 마법사"
+CAPTION "인증서 내보내기 마법사"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "인증서 내보내기 마법서 완료하는 중", IDC_EXPORT_TITLE,
+  LTEXT "인증서 내보내기 마법서 완료하는 중", IDC_EXPORT_TITLE,
     115,1,195,40
-  LTEXT "당신은 인증서 내보내기 마법를 완료하는 데 성공하였습니다.",
+  LTEXT "당신은 인증서 내보내기 마법를 완료하는 데 성공하였습니다.",
     -1, 115,33,195,24
-  LTEXT "당신은 다음 설정을 지정했습니다:",
+  LTEXT "당신은 다음 설정을 지정했습니다:",
     -1, 115,57,195,12
   CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,

reactos/dll/win32/cryptui/cryptui_Lt.rc

@@ -1,7 +1,7 @@
 /*
  * cryptui dll resources
  *
- * Copyright 2009 Aurimas Fišeras <aurimas@gmail.com>
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,197 +20,198 @@
 
 #include "cryptuires.h"
 
-/* UTF-8 */
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-    IDS_CERTIFICATE                         "Liudijimas"
+    IDS_CERTIFICATE "Liudijimas"
-    IDS_CERTIFICATEINFORMATION              "Liudijimo informacija"
+    IDS_CERTIFICATEINFORMATION "Liudijimo informacija"
-    IDS_CERT_INFO_BAD_SIG                   "Šis liudijimas turi neteisingą parašą. Liudijimas galėjo būti pakeistas ar pažeistas."
+    IDS_CERT_INFO_BAD_SIG "Šis liudijimas turi neteisingą parašą. Liudijimas galėjo būti pakeistas ar pažeistas."
-    IDS_CERT_INFO_UNTRUSTED_CA              "Šis vyriausiasis liudijimas yra nepatikimas. Norėdami juo pasitikėti įtraukite jį į sistemos patikimų vyriausiųjų liudijimų saugyklą."
+    IDS_CERT_INFO_UNTRUSTED_CA "Šis vyriausiasis liudijimas yra nepatikimas. Norėdami juo pasitikėti įtraukite jį į sistemos patikimų vyriausiųjų liudijimų saugyklą."
-    IDS_CERT_INFO_UNTRUSTED_ROOT            "Nepavyko patvirtinti šio liudijimo pagal patikimą vyriausiąjį liudijimą."
+    IDS_CERT_INFO_UNTRUSTED_ROOT "Nepavyko patvirtinti šio liudijimo pagal patikimą vyriausiąjį liudijimą."
-    IDS_CERT_INFO_PARTIAL_CHAIN             "Nepavyko rasti liudijimo išdavėjo."
+    IDS_CERT_INFO_PARTIAL_CHAIN "Nepavyko rasti liudijimo išdavėjo."
-    IDS_CERT_INFO_BAD_PURPOSES              "Nepavyko patikrinti visų šio liudijimo paskirties tikslų."
+    IDS_CERT_INFO_BAD_PURPOSES "Nepavyko patikrinti visų šio liudijimo paskirties tikslų."
-    IDS_CERT_INFO_PURPOSES                  "Šis liudijimas yra skirtas šiems tikslams:"
+    IDS_CERT_INFO_PURPOSES "Šis liudijimas yra skirtas šiems tikslams:"
-    IDS_SUBJECT_HEADING                     "Kam išduota: "
+    IDS_SUBJECT_HEADING "Kam išduota: "
-    IDS_ISSUER_HEADING                      "Išdavė: "
+    IDS_ISSUER_HEADING "Išdavė: "
-    IDS_VALID_FROM                          "Galioja nuo "
+    IDS_VALID_FROM "Galioja nuo "
-    IDS_VALID_TO                            " iki "
+    IDS_VALID_TO " iki "
-    IDS_CERTIFICATE_BAD_SIGNATURE           "Šis liudijimas turi neteisingą parašą."
+    IDS_CERTIFICATE_BAD_SIGNATURE "Šis liudijimas turi neteisingą parašą."
-    IDS_CERTIFICATE_BAD_TIME                "Šis liudijimas jau nebegalioja arba dar negalioja."
+    IDS_CERTIFICATE_BAD_TIME "Šis liudijimas jau nebegalioja arba dar negalioja."
-    IDS_CERTIFICATE_BAD_TIMENEST            "Šio liudijimo galiojimo periodas yra didesnis už išdavėjo."
+    IDS_CERTIFICATE_BAD_TIMENEST "Šio liudijimo galiojimo periodas yra didesnis už išdavėjo."
-    IDS_CERTIFICATE_REVOKED                 "Šis liudijimas buvo panaikintas išdavėjo."
+    IDS_CERTIFICATE_REVOKED "Šis liudijimas buvo panaikintas išdavėjo."
-    IDS_CERTIFICATE_VALID                   "Šis liudijimas yra geras."
+    IDS_CERTIFICATE_VALID "Šis liudijimas yra geras."
-    IDS_FIELD                               "Laukas"
+    IDS_FIELD "Laukas"
-    IDS_VALUE                               "Reikšmė"
+    IDS_VALUE "Reikšmė"
-    IDS_FIELDS_ALL                          "<visi laukai>"
+    IDS_FIELDS_ALL "<visi laukai>"
-    IDS_FIELDS_V1                           "Tik pirmos versijos laukai"
+    IDS_FIELDS_V1 "Tik pirmos versijos laukai"
-    IDS_FIELDS_EXTENSIONS                   "Tik plėtiniai"
+    IDS_FIELDS_EXTENSIONS "Tik plėtiniai"
-    IDS_FIELDS_CRITICAL_EXTENSIONS          "Tik būtini plėtiniai"
+    IDS_FIELDS_CRITICAL_EXTENSIONS "Tik būtini plėtiniai"
-    IDS_FIELDS_PROPERTIES                   "Tik savybės"
+    IDS_FIELDS_PROPERTIES "Tik savybės"
-    IDS_FIELD_VERSION                       "Versija"
+    IDS_FIELD_VERSION "Versija"
-    IDS_FIELD_SERIAL_NUMBER                 "Numeris"
+    IDS_FIELD_SERIAL_NUMBER "Numeris"
-    IDS_FIELD_ISSUER                        "Išdavėjas"
+    IDS_FIELD_ISSUER "Išdavėjas"
-    IDS_FIELD_VALID_FROM                    "Galioja nuo"
+    IDS_FIELD_VALID_FROM "Galioja nuo"
-    IDS_FIELD_VALID_TO                      "Galioja iki"
+    IDS_FIELD_VALID_TO "Galioja iki"
-    IDS_FIELD_SUBJECT                       "Subjektas"
+    IDS_FIELD_SUBJECT "Subjektas"
-    IDS_FIELD_PUBLIC_KEY                    "Viešasis raktas"
+    IDS_FIELD_PUBLIC_KEY "Viešasis raktas"
-    IDS_FIELD_PUBLIC_KEY_FORMAT             "%s (%d bitai)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bitai)"
-    IDS_PROP_HASH                           "maiša SHA1"
+    IDS_PROP_HASH "maiša SHA1"
-    IDS_PROP_ENHKEY_USAGE                   "Ypatingas rakto naudojimas (savybė)"
+    IDS_PROP_ENHKEY_USAGE "Ypatingas rakto naudojimas (savybė)"
-    IDS_PROP_FRIENDLY_NAME                  "Draugiškas vardas"
+    IDS_PROP_FRIENDLY_NAME "Draugiškas vardas"
-    IDS_PROP_DESCRIPTION                    "Aprašas"
+    IDS_PROP_DESCRIPTION "Aprašas"
-    IDS_CERTIFICATE_PROPERTIES              "Liudijimo savybės"
+    IDS_CERTIFICATE_PROPERTIES "Liudijimo savybės"
-    IDS_CERTIFICATE_PURPOSE_ERROR           "Prašau įveskite organizacijos identifikatorių tokia forma: 1.2.3.4"
+    IDS_CERTIFICATE_PURPOSE_ERROR "Prašau įveskite organizacijos identifikatorių tokia forma: 1.2.3.4"
-    IDS_CERTIFICATE_PURPOSE_EXISTS          "Įvestas organizacijos identifikatorius jau egzistuoja."
+    IDS_CERTIFICATE_PURPOSE_EXISTS "Įvestas organizacijos identifikatorius jau egzistuoja."
-    IDS_SELECT_STORE_TITLE                  "Išrinkite liudijimų saugyklą"
+    IDS_SELECT_STORE_TITLE "Išrinkite liudijimų saugyklą"
-    IDS_SELECT_STORE                        "Prašau išrinkite liudijimų saugyklą."
+    IDS_SELECT_STORE "Prašau išrinkite liudijimų saugyklą."
-    IDS_IMPORT_WIZARD                       "Liudijimo importo vediklis"
+    IDS_IMPORT_WIZARD "Liudijimo importo vediklis"
-    IDS_IMPORT_TYPE_MISMATCH                "Faile yra objektų, kurie neatitinka nustatytų kriterijų. Prašau išrinkite kitą failą."
+    IDS_IMPORT_TYPE_MISMATCH "Faile yra objektų, kurie neatitinka nustatytų kriterijų. Prašau išrinkite kitą failą."
-    IDS_IMPORT_FILE_TITLE                   "Importo failas"
+    IDS_IMPORT_FILE_TITLE "Importo failas"
-    IDS_IMPORT_FILE_SUBTITLE                "Nurodykite failą importui."
+    IDS_IMPORT_FILE_SUBTITLE "Nurodykite failą importui."
-    IDS_IMPORT_STORE_TITLE                  "Liudijimų saugykla"
+    IDS_IMPORT_STORE_TITLE "Liudijimų saugykla"
-    IDS_IMPORT_STORE_SUBTITLE               "Liudijimų saugyklos yra liudijimų rinkiniai, atšauktų liudijimų sąrašai ir patikintų liudijimų sąrašai."
+    IDS_IMPORT_STORE_SUBTITLE "Liudijimų saugyklos yra liudijimų rinkiniai, atšauktų liudijimų sąrašai ir patikintų liudijimų sąrašai."
-    IDS_IMPORT_FILTER_CERT                  "X.509 liudijimas (*.cer; *.crt)"
+    IDS_IMPORT_FILTER_CERT "X.509 liudijimas (*.cer; *.crt)"
-    IDS_IMPORT_FILTER_PFX                   "Asmeninės informacijos mainai (*.pfx; *.p12)"
+    IDS_IMPORT_FILTER_PFX "Asmeninės informacijos mainai (*.pfx; *.p12)"
-    IDS_IMPORT_FILTER_CRL                   "Atšauktų liudijimų sąrašas (*.crl)"
+    IDS_IMPORT_FILTER_CRL "Atšauktų liudijimų sąrašas (*.crl)"
-    IDS_IMPORT_FILTER_CTL                   "Patikintų liudijimų sąrašas (*.stl)"
+    IDS_IMPORT_FILTER_CTL "Patikintų liudijimų sąrašas (*.stl)"
-    IDS_IMPORT_FILTER_SERIALIZED_STORE      "Išdėstyta serijomis liudijimų saugykla (*.sst)"
+    IDS_IMPORT_FILTER_SERIALIZED_STORE "Išdėstyta serijomis liudijimų saugykla (*.sst)"
-    IDS_IMPORT_FILTER_CMS                   "CMS/PKCS #7 pranešimai (*.spc; *.p7b)"
+    IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 pranešimai (*.spc; *.p7b)"
-    IDS_IMPORT_FILTER_ALL                   "Visi failai (*.*)"
+    IDS_IMPORT_FILTER_ALL "Visi failai (*.*)"
-    IDS_IMPORT_EMPTY_FILE                   "Prašau išrinkite failą."
+    IDS_IMPORT_EMPTY_FILE "Prašau išrinkite failą."
-    IDS_IMPORT_BAD_FORMAT                   "Neatpažintas failo formatas. Prašau išrinkite kitą failą."
+    IDS_IMPORT_BAD_FORMAT "Neatpažintas failo formatas. Prašau išrinkite kitą failą."
-    IDS_IMPORT_OPEN_FAILED                  "Nepavyko atverti "
+    IDS_IMPORT_OPEN_FAILED "Nepavyko atverti "
-    IDS_IMPORT_DEST_DETERMINED              "Nustatyta programos"
+    IDS_IMPORT_DEST_DETERMINED "Nustatyta programos"
-    IDS_IMPORT_SELECT_STORE                 "Prašau išrinkite saugyklą"
+    IDS_IMPORT_SELECT_STORE "Prašau išrinkite saugyklą"
-    IDS_IMPORT_STORE_SELECTION              "Išrinkta liudijimų saugykla"
+    IDS_IMPORT_STORE_SELECTION "Išrinkta liudijimų saugykla"
-    IDS_IMPORT_DEST_AUTOMATIC               "Automatiškai nustatyta programos"
+    IDS_IMPORT_DEST_AUTOMATIC "Automatiškai nustatyta programos"
-    IDS_IMPORT_FILE                         "Failas"
+    IDS_IMPORT_FILE "Failas"
-    IDS_IMPORT_CONTENT                      "Turinys"
+    IDS_IMPORT_CONTENT "Turinys"
-    IDS_IMPORT_CONTENT_CERT                 "Liudijimas"
+    IDS_IMPORT_CONTENT_CERT "Liudijimas"
-    IDS_IMPORT_CONTENT_CRL                  "Atšauktų liudijimų sąrašas"
+    IDS_IMPORT_CONTENT_CRL "Atšauktų liudijimų sąrašas"
-    IDS_IMPORT_CONTENT_CTL                  "Patikintų liudijimų sąrašas"
+    IDS_IMPORT_CONTENT_CTL "Patikintų liudijimų sąrašas"
-    IDS_IMPORT_CONTENT_CMS                  "CMS/PKCS #7 pranešimas"
+    IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 pranešimas"
-    IDS_IMPORT_CONTENT_PFX                  "Asmeninės informacijos mainai"
+    IDS_IMPORT_CONTENT_PFX "Asmeninės informacijos mainai"
-    IDS_IMPORT_CONTENT_STORE                "Liudijimų saugykla"
+    IDS_IMPORT_CONTENT_STORE "Liudijimų saugykla"
-    IDS_IMPORT_SUCCEEDED                    "Importas sėkmingas."
+    IDS_IMPORT_SUCCEEDED "Importas sėkmingas."
-    IDS_IMPORT_FAILED                       "Importas nepavyko."
+    IDS_IMPORT_FAILED "Importas nepavyko."
-    IDS_WIZARD_TITLE_FONT                   "Arial"
+    IDS_WIZARD_TITLE_FONT "Arial"
-    IDS_PURPOSE_ALL                         "<visos>"
+    IDS_PURPOSE_ALL "<visi laukai>"
-    IDS_PURPOSE_ADVANCED                    "<papildomos paskirtys>"
+    IDS_PURPOSE_ADVANCED "<papildomos paskirtys>"
-    IDS_SUBJECT_COLUMN                      "Kam išduotas"
+    IDS_SUBJECT_COLUMN "Kam išduotas"
-    IDS_ISSUER_COLUMN                       "Išdavė"
+    IDS_ISSUER_COLUMN "Išdavė"
-    IDS_EXPIRATION_COLUMN                   "Galiojimo data"
+    IDS_EXPIRATION_COLUMN "Galiojimo data"
-    IDS_FRIENDLY_NAME_COLUMN                "Draugiškas vardas"
+    IDS_FRIENDLY_NAME_COLUMN "Draugiškas vardas"
-    IDS_ALLOWED_PURPOSE_ALL                 "<visos>"
+    IDS_ALLOWED_PURPOSE_ALL "<visi laukai>"
-    IDS_ALLOWED_PURPOSE_NONE                "<jokios>"
+    IDS_ALLOWED_PURPOSE_NONE "<jokios>"
-    IDS_WARN_REMOVE_MY                      "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar pasirašyti pranešimų.\nAr tikrai norite pašalinti šį liudijimą?"
+    IDS_WARN_REMOVE_MY "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar pasirašyti pranešimų.\n\
-    IDS_WARN_REMOVE_PLURAL_MY               "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar pasirašyti pranešimų.\nAr tikrai norite pašalinti šiuos liudijimus?"
+Ar tikrai norite pašalinti šį liudijimą?"
-    IDS_WARN_REMOVE_ADDRESSBOOK             "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar patikrinti pasirašytų pranešimų.\nAr tikrai norite pašalinti šį liudijimą?"
+    IDS_WARN_REMOVE_PLURAL_MY "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar pasirašyti pranešimų.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK      "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar patikrinti pasirašytų pranešimų.\nAr tikrai norite pašalinti šiuos liudijimus?"
+Ar tikrai norite pašalinti šiuos liudijimus?"
-    IDS_WARN_REMOVE_CA                      "Liudijimais, išduotais šios liudijimo įstaigos, nebebus pasitikima.\nAr tikrai norite pašalinti šį liudijimą?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar patikrinti pasirašytų pranešimų.\n\
-    IDS_WARN_REMOVE_PLURAL_CA               "Liudijimais, išduotais šių liudijimo įstaigų, nebebus pasitikima.\nAr tikrai norite pašalinti šiuos liudijimus?"
+Ar tikrai norite pašalinti šį liudijimą?"
-    IDS_WARN_REMOVE_ROOT                    "Liudijimais, išduotais šios vyriausiosios liudijimo įstaigos, ar bet kurios jos išduotos liudijimų įstaigos liudijimais, nebebus pasitikima.\nAr tikrai norite pašalinti šį patikimą vyriausiąjį liudijimą?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Su šiuo liudijimu jūs daugiau nebegalėsite iššifruoti pranešimų ar patikrinti pasirašytų pranešimų.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT             "Liudijimais, išduotais šių vyriausiųjų liudijimo įstaigų, ar bet kurių jų išduotų liudijimų įstaigų liudijimais, nebebus pasitikima.\nAr tikrai norite pašalinti šiuos patikimus vyriausiuosius liudijimus?"
+Ar tikrai norite pašalinti šiuos liudijimus?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER        "Nebebus pasitikima programine įranga pasirašyta šio leidėjo.\nAr tikrai norite pašalinti šį liudijimą?"
+    IDS_WARN_REMOVE_CA "Liudijimais, išduotais šios liudijimo įstaigos, nebebus pasitikima.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Nebebus pasitikima programine įranga pasirašyta šių leidėjų.\nAr tikrai norite pašalinti šiuos liudijimus?"
+Ar tikrai norite pašalinti šį liudijimą?"
-    IDS_WARN_REMOVE_DEFAULT                 "Ar tikrai norite pašalinti šį liudijimą?"
+    IDS_WARN_REMOVE_PLURAL_CA "Liudijimais, išduotais šių liudijimo įstaigų, nebebus pasitikima.\n\
-    IDS_WARN_REMOVE_PLURAL_DEFAULT          "Ar tikrai norite pašalinti šiuos liudijimus?"
+Ar tikrai norite pašalinti šiuos liudijimus?"
-    IDS_CERT_MGR                            "Liudijimai"
+    IDS_WARN_REMOVE_ROOT "Liudijimais, išduotais šios vyriausiosios liudijimo įstaigos, ar bet kurios jos išduotos liudijimų įstaigos liudijimais, nebebus pasitikima.\n\
-    IDS_FRIENDLY_NAME_NONE                  "<joks>"
+Ar tikrai norite pašalinti šį patikimą vyriausiąjį liudijimą?"
-    IDS_PURPOSE_SERVER_AUTH                 "Garantuoja nutolusio kompiuterio tapatumą"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Liudijimais, išduotais šių vyriausiųjų liudijimo įstaigų, ar bet kurių jų išduotų liudijimų įstaigų liudijimais, nebebus pasitikima.\n\
-    IDS_PURPOSE_CLIENT_AUTH                 "Įrodo jūsų tapatumą nutolusiam kompiuteriui"
+Ar tikrai norite pašalinti šiuos patikimus vyriausiuosius liudijimus?"
-    IDS_PURPOSE_CODE_SIGNING                "Garantuoja, kad programinė įranga yra iš šio leidėjo\nApsaugo programinę įrangą nuo pakeitimų po išleidimo"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Nebebus pasitikima programine įranga pasirašyta šio leidėjo.\n\
-    IDS_PURPOSE_EMAIL_PROTECTION            "Apsaugo el. pašto pranešimus"
+Ar tikrai norite pašalinti šį liudijimą?"
-    IDS_PURPOSE_IPSEC                       "Leidžia saugu ryšį internete"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Nebebus pasitikima programine įranga pasirašyta šių leidėjų.\n\
-    IDS_PURPOSE_TIMESTAMP_SIGNING           "Leidžia pasirašyti duomenis dabartiniu laiku"
+Ar tikrai norite pašalinti šiuos liudijimus?"
-    IDS_PURPOSE_CTL_USAGE_SIGNING           "Leidžia skaitmeniškai pasirašyti patikintų liudijimų sąrašą"
+    IDS_WARN_REMOVE_DEFAULT "Ar tikrai norite pašalinti šį liudijimą?"
-    IDS_PURPOSE_EFS                         "Leidžia užšifruoti duomenis diske"
+    IDS_WARN_REMOVE_PLURAL_DEFAULT "Ar tikrai norite pašalinti šiuos liudijimus?"
-    IDS_PURPOSE_EFS_RECOVERY                "Failų atkūrimas"
+    IDS_CERT_MGR "Liudijimai"
-    IDS_PURPOSE_WHQL                        "Windows tvarkyklių patikra"
+    IDS_FRIENDLY_NAME_NONE "<jokios>"
-    IDS_PURPOSE_NT5                         "Windows sistemos komponentų patikra"
+    IDS_PURPOSE_SERVER_AUTH "Garantuoja nutolusio kompiuterio tapatumą"
-    IDS_PURPOSE_OEM_WHQL                    "OEM Windows sistemos komponentų patikra"
+    IDS_PURPOSE_CLIENT_AUTH "Įrodo jūsų tapatumą nutolusiam kompiuteriui"
-    IDS_PURPOSE_EMBEDDED_NT                 "Įtaisytų Windows sistemos komponentų patikra"
+    IDS_PURPOSE_CODE_SIGNING "Garantuoja, kad programinė įranga yra iš šio leidėjo\n\
-    IDS_PURPOSE_ROOT_LIST_SIGNER            "Pagrindinio sąrašo pasirašytojas"
+Apsaugo programinę įrangą nuo pakeitimų po išleidimo"
-    IDS_PURPOSE_QUALIFIED_SUBORDINATION     "Patikslintoji hierarchija"
+    IDS_PURPOSE_EMAIL_PROTECTION "Apsaugo el. pašto pranešimus"
-    IDS_PURPOSE_KEY_RECOVERY                "Rakto atkūrimas"
+    IDS_PURPOSE_IPSEC "Leidžia saugu ryšį internete"
-    IDS_PURPOSE_DOCUMENT_SIGNING            "Dokumentų pasirašymas"
+    IDS_PURPOSE_TIMESTAMP_SIGNING "Leidžia pasirašyti duomenis dabartiniu laiku"
-    IDS_PURPOSE_LIFETIME_SIGNING            "Gyvavimo ciklo pasirašymas"
+    IDS_PURPOSE_CTL_USAGE_SIGNING "Leidžia skaitmeniškai pasirašyti patikintų liudijimų sąrašą"
-    IDS_PURPOSE_DRM                         "Skaitmeninės teisės"
+    IDS_PURPOSE_EFS "Leidžia užšifruoti duomenis diske"
-    IDS_PURPOSE_LICENSES                    "Kodų pako licencijos"
+    IDS_PURPOSE_EFS_RECOVERY "Failų atkūrimas"
-    IDS_PURPOSE_LICENSE_SERVER              "Licencijų serverio patikra"
+    IDS_PURPOSE_WHQL "Windows tvarkyklių patikra"
-    IDS_PURPOSE_ENROLLMENT_AGENT            "Liudijimo užklausos priemonė"
+    IDS_PURPOSE_NT5 "Windows sistemos komponentų patikra"
-    IDS_PURPOSE_SMARTCARD_LOGON             "Lustinių kortelių įvedimas"
+    IDS_PURPOSE_OEM_WHQL "OEM Windows sistemos komponentų patikra"
-    IDS_PURPOSE_CA_EXCHANGE                 "Privačiojo rakto archyvavimas"
+    IDS_PURPOSE_EMBEDDED_NT "Įtaisytų Windows sistemos komponentų patikra"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT          "Rakto atkūrimo priemonė"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "Pagrindinio sąrašo pasirašytojas"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION        "Katalogų serverio el. pašto dauginimas"
+    IDS_PURPOSE_QUALIFIED_SUBORDINATION "Patikslintoji hierarchija"
-    IDS_EXPORT_WIZARD                       "Liudijimo eksporto vediklis"
+    IDS_PURPOSE_KEY_RECOVERY "Rakto atkūrimas"
-    IDS_EXPORT_FORMAT_TITLE                 "Eksporto formatas"
+    IDS_PURPOSE_DOCUMENT_SIGNING "Dokumentų pasirašymas"
-    IDS_EXPORT_FORMAT_SUBTITLE              "Išsirinkite formatą duomenims išsaugoti."
+    IDS_PURPOSE_LIFETIME_SIGNING "Gyvavimo ciklo pasirašymas"
-    IDS_EXPORT_FILE_TITLE                   "Eksporto failas"
+    IDS_PURPOSE_DRM "Skaitmeninės teisės"
-    IDS_EXPORT_FILE_SUBTITLE                "Nurodykite failą, kuriame bus išsaugoti duomenys."
+    IDS_PURPOSE_LICENSES "Kodų pako licencijos"
-    IDS_EXPORT_FILE_EXISTS                  "Nurodytas failas egzistuoja. Ar norite jį perrašyti?"
+    IDS_PURPOSE_LICENSE_SERVER "Licencijų serverio patikra"
-    IDS_EXPORT_FILTER_CERT                  "DER-užkoduotas dvejetainis X.509 (*.cer)"
+    IDS_PURPOSE_ENROLLMENT_AGENT "Liudijimo užklausos priemonė"
-    IDS_EXPORT_FILTER_BASE64_CERT           "Base64-užkoduotas X.509 (*.cer)"
+    IDS_PURPOSE_SMARTCARD_LOGON "Lustinių kortelių įvedimas"
-    IDS_EXPORT_FILTER_CRL                   "Atšauktų liudijimų sąrašas (*.crl)"
+    IDS_PURPOSE_CA_EXCHANGE "Privačiojo rakto archyvavimas"
-    IDS_EXPORT_FILTER_CTL                   "Patikintų liudijimų sąrašas (*.stl)"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "Rakto atkūrimo priemonė"
-    IDS_EXPORT_FILTER_CMS                   "CMS/PKCS #7 pranešimai (*.p7b)"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Katalogų serverio el. pašto dauginimas"
-    IDS_EXPORT_FILTER_PFX                   "Asmeninės informacijos mainai (*.pfx)"
+    IDS_EXPORT_WIZARD "Liudijimo eksporto vediklis"
+    IDS_EXPORT_FORMAT_TITLE "Eksporto formatas"
+    IDS_EXPORT_FORMAT_SUBTITLE "Išsirinkite formatą duomenims išsaugoti."
+    IDS_EXPORT_FILE_TITLE "Eksporto failas"
+    IDS_EXPORT_FILE_SUBTITLE "Nurodykite failą, kuriame bus išsaugoti duomenys."
+    IDS_EXPORT_FILE_EXISTS "Nurodytas failas egzistuoja. Ar norite jį perrašyti?"
+    IDS_EXPORT_FILTER_CERT "DER-užkoduotas dvejetainis X.509 (*.cer)"
+    IDS_EXPORT_FILTER_BASE64_CERT "Base64-užkoduotas X.509 (*.cer)"
+    IDS_EXPORT_FILTER_CRL "Atšauktų liudijimų sąrašas (*.crl)"
+    IDS_EXPORT_FILTER_CTL "Patikintų liudijimų sąrašas (*.stl)"
+    IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 pranešimai (*.p7b)"
+    IDS_EXPORT_FILTER_PFX "Asmeninės informacijos mainai (*.pfx)"
     IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Išdėstyta serijomis liudijimų saugykla (*.sst)"
-    IDS_EXPORT_FORMAT                       "Failo formatas"
+    IDS_EXPORT_FORMAT "Failo formatas"
-    IDS_EXPORT_INCLUDE_CHAIN                "Apimti visus liudijimus liudijimų kelyje"
+    IDS_EXPORT_INCLUDE_CHAIN "Apimti visus liudijimus liudijimų kelyje"
-    IDS_EXPORT_KEYS                         "Eksportuoti raktus"
+    IDS_EXPORT_KEYS "Eksportuoti raktus"
-    IDS_YES                                 "Taip"
+    IDS_YES "Taip"
-    IDS_NO                                  "Ne"
+    IDS_NO "Ne"
-    IDS_EXPORT_SUCCEEDED                    "Eksportas sėkmingas."
+    IDS_EXPORT_SUCCEEDED "Eksportas sėkmingas."
-    IDS_EXPORT_FAILED                       "Eksportas nepavyko."
+    IDS_EXPORT_FAILED "Eksportas nepavyko."
-    IDS_EXPORT_PRIVATE_KEY_TITLE            "Eksportuoti privatųjį raktą"
+    IDS_EXPORT_PRIVATE_KEY_TITLE "Eksportuoti privatųjį raktą"
-    IDS_EXPORT_PRIVATE_KEY_SUBTITLE         "Liudijimas turi privatųjį raktą, kuris gali būti išeksportuotas kartu su liudijimu."
+    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Liudijimas turi privatųjį raktą, kuris gali būti išeksportuotas kartu su liudijimu."
-    IDS_EXPORT_PASSWORD_TITLE               "Įveskite slaptažodį"
+    IDS_EXPORT_PASSWORD_TITLE "Įveskite slaptažodį"
-    IDS_EXPORT_PASSWORD_SUBTITLE            "Jūs galite apsaugoti privatųjį raktą slaptažodžiu."
+    IDS_EXPORT_PASSWORD_SUBTITLE "Jūs galite apsaugoti privatųjį raktą slaptažodžiu."
-    IDS_EXPORT_PASSWORD_MISMATCH            "Slaptažodžiai nesutampa."
+    IDS_EXPORT_PASSWORD_MISMATCH "Slaptažodžiai nesutampa."
-    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE      "Pastaba: nepavyko atverti privačiojo rakto šiam liudijimui."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Pastaba: nepavyko atverti privačiojo rakto šiam liudijimui."
-    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE   "Pastaba: šio liudijimo privatusis raktas neišeksportuojamas."
+    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Pastaba: šio liudijimo privatusis raktas neišeksportuojamas."
 }
 
 IDD_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "Bendras"
+CAPTION "Bendrosios"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Įdiegti liudijimą...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Įdiegti liudijimą...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "Išdavėjo &teiginys", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "Išdavėjo &teiginys", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
-CAPTION "Išsamiau"
+CAPTION "Išsamiai"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Rodyti:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 33,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "Redaguoti &savybes...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Kopijuoti į failą...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "Redaguoti &savybes...", IDC_EDITPROPERTIES,83,216,80,14
-  PUSHBUTTON "&Kopijuoti į failą...", IDC_EXPORT,167,216,80,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -218,11 +219,11 @@ CAPTION "Liudijimo kelias"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Liudijimo &kelias", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "Liudijimo kelias", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Peržiūrėti liudijimą", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Peržiūrėti liudijimą", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "Liudijimo &būsena:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "Liudijimo &būsena:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -234,30 +235,30 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Užverti", IDOK,93,216,75,14
+  PUSHBUTTON "Užverti", IDOK,73,216,85,14
-  PUSHBUTTON "Daugiau &informacijos", IDC_CPS,172,216,75,14
+  PUSHBUTTON "Daugiau &informacijos", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "Bendras"
+CAPTION "Bendrosios"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Draugiškas vardas:", -1, 6,14,70,14
+  LTEXT "&Draugiškas vardas:", -1, 6,14,60,14
   EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Aprašas:", -1, 6,32,70,14
+  LTEXT "&Aprašas:", -1, 6,32,60,14
   EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Liudijimo paskirtys", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Liudijimo paskirtys", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "&Įjungti visas šio liudijimo paskirtis",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Išj&ungti visas šio liudijimo paskirtis",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Įjungti &tik šias šio liudijimo paskirtis:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Pridėti &paskirtį...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Pridėti &paskirtį...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -278,8 +279,7 @@ BEGIN
   LTEXT "Išrinkite liudijimų saugyklą, kurią norite naudoti:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Rodyti fizines saugyklas", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Rodyti fizines saugyklas", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "Gerai", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Atsisakyti", IDCANCEL, 144,118,50,14
 END
@@ -288,31 +288,30 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Liudijimo importo vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Sveiki atvėrę liudijimo importo vediklį", IDC_IMPORT_TITLE,
+  LTEXT "Sveiki atvėrę liudijimo importo vediklį", IDC_IMPORT_TITLE, 115,7,195,30
-    115,1,195,32
+  LTEXT "Šis vediklis padeda jums importuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš failo į liudijimų saugyklą.\n\
-  LTEXT "Šis vediklis padės jums importuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš failo į liudijimų saugyklą.",
+\n\
-    -1, 115,25,195,24
+Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas tapatumo nustatymui ir pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų, atšauktų liudijimų sąrašų ir patikintų liudijimų sąrašų rinkiniai.\n\
-  LTEXT "Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų rinkiniai, atšauktų liudijimų sąrašai ir patikintų liudijimų sąrašai.",
+\n\
-    -1, 115,56,195,40
+Jei norite tęsti, spauskite Kitas.",
-  LTEXT "Norėdami tęsti, spauskite „Toliau“.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
-IDD_IMPORT_FILE DIALOG 0,0,317,143
+IDD_IMPORT_FILE DIALOG 0,0,317,178
 CAPTION "Liudijimo importo vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Failas:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Parinkti...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Pari&nkti...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Pastaba: Šie failų formatai gali turėti daugiau negu vieną liudijimą, atšauktų liudijimų sąrašą ar patikintų liudijimų sąrašą:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimai (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Asmeninės informacijos mainai/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Microsoft išdėstyta serijomis liudijimų saugykla (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -320,16 +319,16 @@ CAPTION "Liudijimo importo vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine gali automatiškai parinkti liudijimų saugyklą arba jūs galite nurodyti vietą liudijimams.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "Automatiškai pa&rinkti liudijimų saugyklą",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Patalpinti &visus liudijimus į šią saugyklą:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Parinkti...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "Pari&nkti...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
-IDD_IMPORT_FINISH DIALOG 0,0,317,143
+IDD_IMPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Liudijimo importo vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -349,19 +348,16 @@ CAPTION "Liudijimai"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Numatytos paskirtys:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importuoti...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Eksportuoti...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "Pa&šalinti", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importuoti...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "Išs&amiau...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Eksportuoti...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Šalinti", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "Išs&amiau...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Liudijimo numatytos paskirtys", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,204,252,32
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Peržiūrėti...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Rodymas", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Užverti", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -384,22 +380,21 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Liudijimo eksporto vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Sveiki atvėrę liudijimo eksporto vediklį", IDC_EXPORT_TITLE,
+  LTEXT "Sveiki atvėrę liudijimo eksporto vediklį", IDC_EXPORT_TITLE, 115,7,195,30
-    115,1,195,32
+  LTEXT "Šis vediklis padeda jums eksportuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš liudijimų saugyklos į failą.\n\
-  LTEXT "Šis valdiklis padės jums eksportuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš liudijimų saugyklos į failą.",
+\n\
-    -1, 115,25,195,24
+Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas tapatumo nustatymui ir pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų, atšauktų liudijimų sąrašų ir patikintų liudijimų sąrašų rinkiniai.\n\
-  LTEXT "Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų rinkiniai, atšauktų liudijimų sąrašai ir patikintų liudijimų sąrašai.",
+\n\
-    -1, 115,56,195,40
+Jei norite tęsti, spauskite Kitas.",
-  LTEXT "Norėdami tęsti, spauskite „Toliau“.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
 CAPTION "Liudijimo eksporto vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Jei pasirinksite eksportuoti privatųjį raktą, kitame lape būsite paklausti įvesti slaptažodį raktui apsaugoti.", -1, 21,1,195,23
+  LTEXT "Jei pasirinksite eksportuoti privatųjį raktą, kitame lape būsite paklausti įvesti slaptažodį raktui apsaugoti.", -1, 21,1,195,25
-  LTEXT "Ar norite eksportuoti privatųjį raktą?", -1, 21,24,195,15
+  LTEXT "Ar norite eksportuoti privatųjį raktą?", -1, 21,27,195,10
   AUTORADIOBUTTON "&Taip, eksportuoti privatųjį raktą",
     IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Ne, neeksportuoti privačiojo rakto",
@@ -423,23 +418,21 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Išrinkite formatą, kurį norite naudoti:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-užkoduotas X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,260,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ba&se64-užkoduotas X.509 (.cer)",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,260,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimas (.p7b):",
-    IDC_EXPORT_FORMAT_CMS, 31,42,260,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Jei įmanoma, apimti visus liudijimus liudijimų kelyje",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "&Asmeninės informacijos mainai/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,260,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "A&pimti visus liudijimus liudijimų kelyje",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Įjungti stiprų &šifravimą",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Iš&trinti privatųjį raktą, kai eksportas sėkmingas",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
@@ -448,10 +441,10 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Failas:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Parinkti...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Pari&nkti...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
-IDD_EXPORT_FINISH DIALOG 0,0,317,143
+IDD_EXPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Liudijimo eksporto vediklis"
 FONT 8, "MS Shell Dlg"
 BEGIN

reactos/dll/win32/cryptui/cryptui_Nl.rc

@@ -1,7 +1,7 @@
 /*
- * cryptui dll 	dutch resources
+ * cryptui dll resources
  *
- * Copyright 2009 Frans Kool
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,7 @@
 
 #include "cryptuires.h"
 
-#pragma code_page(65001)
+LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
-
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
@@ -57,7 +55,7 @@ STRINGTABLE
     IDS_FIELD_VALID_TO "Geldig tot"
     IDS_FIELD_SUBJECT "Onderwerp"
     IDS_FIELD_PUBLIC_KEY "Publieke sleutel"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bits)"
     IDS_PROP_HASH "SHA1 hash"
     IDS_PROP_ENHKEY_USAGE "Uitgebreid sleutel gebruik (eigenschap)"
     IDS_PROP_FRIENDLY_NAME "Naam alias"
@@ -91,7 +89,7 @@ STRINGTABLE
     IDS_IMPORT_CONTENT "Inhoud"
     IDS_IMPORT_CONTENT_CERT "Certificaat"
     IDS_IMPORT_CONTENT_CRL "Certificaat terugroeplijst"
-    IDS_IMPORT_CONTENT_CTL "Certificaat vertrouwenslijst"
+    IDS_IMPORT_CONTENT_CTL "Certificaat Vertrouwenslijst"
     IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 bericht"
     IDS_IMPORT_CONTENT_PFX "Persoonlijke informatie uitwisseling"
     IDS_IMPORT_CONTENT_STORE "Certificatenopslag"
@@ -106,23 +104,34 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Naam alias"
     IDS_ALLOWED_PURPOSE_ALL "<Alle>"
     IDS_ALLOWED_PURPOSE_NONE "<Geen>"
-    IDS_WARN_REMOVE_MY "U kunt niet langer berichten ontcijferen of ondertekenen met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_MY "U kunt niet langer berichten ontcijferen of ondertekenen met dit certificaat.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "U kunt niet langer berichten ontcijferen of ondertekenen met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?"
+Weet u zeker dat u dit certificaat wilt verwijderen?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_PLURAL_MY "U kunt niet langer berichten ontcijferen of ondertekenen met deze certificaten.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?"
+Weet u zeker dat u deze certificaten wilt verwijderen?"
-    IDS_WARN_REMOVE_CA "Certificaten uitgegeven door deze certificaten autoriteit zullen niet meer vertrouwd worden.\nWeet u zeker dat u dit certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met dit certificaat.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Certificaten uitgegeven door deze certificaten autoriteiten zullen niet meer vertrouwd worden.\nWeet u zeker dat u deze certificaten wilt verwijderen?"
+Weet u zeker dat u dit certificaat wilt verwijderen?"
-    IDS_WARN_REMOVE_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteit, alsmede enige certificatie autoriteit die hij verstrekt, zullen niet meer vertrouwd worden.\nWeet u zeker dat u dit vertrouwde basic certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met deze certificaten.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteiten, alsmede enige certificatie autoriteit die zij verstrekken, zullen niet meer vertrouwd worden.\nWeet u zeker dat u deze vertrouwde basic certificaten wilt verwijderen?"
+Weet u zeker dat u deze certificaten wilt verwijderen?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software ondertekend door deze uitgever zal niet meer vertrouwd worden.\nWeet u zeker dat u dit certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_CA "Certificaten uitgegeven door deze certificaten autoriteit zullen niet meer vertrouwd worden.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software ondertekend door deze uitgevers zal niet meer vertrouwd worden.\nWeet u zeker dat u deze certificaten wilt verwijderen?"
+Weet u zeker dat u dit certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_PLURAL_CA "Certificaten uitgegeven door deze certificaten autoriteiten zullen niet meer vertrouwd worden.\n\
+Weet u zeker dat u deze certificaten wilt verwijderen?"
+    IDS_WARN_REMOVE_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteit, alsmede enige certificatie autoriteit die hij verstrekt, zullen niet meer vertrouwd worden.\n\
+Weet u zeker dat u dit vertrouwde basic certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteiten, alsmede enige certificatie autoriteit die zij verstrekken, zullen niet meer vertrouwd worden.\n\
+Weet u zeker dat u deze vertrouwde basic certificaten wilt verwijderen?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software ondertekend door deze uitgever zal niet meer vertrouwd worden.\n\
+Weet u zeker dat u dit certificaat wilt verwijderen?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software ondertekend door deze uitgevers zal niet meer vertrouwd worden.\n\
+Weet u zeker dat u deze certificaten wilt verwijderen?"
     IDS_WARN_REMOVE_DEFAULT "Weet u zeker dat u dit certificaat wilt verwijderen?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Weet u zeker dat u deze certificaten wilt verwijderen?"
     IDS_CERT_MGR "Certificaten"
     IDS_FRIENDLY_NAME_NONE "<Geen>"
     IDS_PURPOSE_SERVER_AUTH "Bewijst de identiteit van een remote computer"
     IDS_PURPOSE_CLIENT_AUTH "Bewijst uw identiteit aan een remote computer"
-    IDS_PURPOSE_CODE_SIGNING "Bewijst dat de software kwam van de software uitgever\nBeschermt software tegen wijzigingen na publicatie"
+    IDS_PURPOSE_CODE_SIGNING "Bewijst dat de software kwam van de software uitgever\n\
+Beschermt software tegen wijzigingen na publicatie"
     IDS_PURPOSE_EMAIL_PROTECTION "Beschermt e-mail berichten"
     IDS_PURPOSE_IPSEC "Staat beveiligde communicatie over het Internet toe"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Laat data ondertekend worden met de huidige tijd"
@@ -130,22 +139,22 @@ STRINGTABLE
     IDS_PURPOSE_EFS "Laat data op de disk gecodeerd worden"
     IDS_PURPOSE_EFS_RECOVERY "Bestandsherstel"
     IDS_PURPOSE_WHQL "Windows Hardware Driver Verificatie"
-    IDS_PURPOSE_NT5 "Windows System Component Verificatie"
+    IDS_PURPOSE_NT5 "Windows Systeem Component Verificatie"
     IDS_PURPOSE_OEM_WHQL "OEM Windows Systeem Component Verificatie"
     IDS_PURPOSE_EMBEDDED_NT "Ingebed Windows Systeem Component Verificatie"
     IDS_PURPOSE_ROOT_LIST_SIGNER "Basislijst Ondertekenaar"
     IDS_PURPOSE_QUALIFIED_SUBORDINATION "Gekwalificeerde ondergeschiktheid"
     IDS_PURPOSE_KEY_RECOVERY "Sleutel herstellen"
-    IDS_PURPOSE_DOCUMENT_SIGNING "Document ondertekening"
+    IDS_PURPOSE_DOCUMENT_SIGNING "Document-ondertekening"
     IDS_PURPOSE_LIFETIME_SIGNING "Levenslang ondertekenen"
     IDS_PURPOSE_DRM "Digitale rechten"
-    IDS_PURPOSE_LICENSES "Sleutelbos licenties"
+    IDS_PURPOSE_LICENSES "Sleutelbos-licenties"
     IDS_PURPOSE_LICENSE_SERVER "Licentieserver verificatie"
-    IDS_PURPOSE_ENROLLMENT_AGENT "Certificaatverzoek agent"
+    IDS_PURPOSE_ENROLLMENT_AGENT "Certificaat Verzoek Agent"
-    IDS_PURPOSE_SMARTCARD_LOGON "Smartcard aanloggen"
+    IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Aanmelden"
     IDS_PURPOSE_CA_EXCHANGE "Persoonlijke sleutel archiefbescheiden"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "Sleutel herstel agent"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "Sleutel Herstel Agent"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory service email replicatie"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory service e-mail replicatie"
     IDS_EXPORT_WIZARD "Certificaat Exporteerhulp"
     IDS_EXPORT_FORMAT_TITLE "Export formaat"
     IDS_EXPORT_FORMAT_SUBTITLE "Selecteer het formaat waarin de inhoud zal worden opgeslagen."
@@ -171,8 +180,8 @@ STRINGTABLE
     IDS_EXPORT_PASSWORD_TITLE "Voer wachtwoord in"
     IDS_EXPORT_PASSWORD_SUBTITLE "U kunt een persoonlijke sleutel beveiligen met een wachtwoord."
     IDS_EXPORT_PASSWORD_MISMATCH "De wachtwoorden zijn niet gelijk."
-    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "NB: De persoonlijke sleutel voor dit certificaat kon niet geopend worden."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Noot: De persoonlijke sleutel voor dit certificaat kon niet geopend worden."
-    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note: De persoonlijke sleutel voor dit certificaat kan niet geëxporteerd worden."
+    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Noot: De persoonlijke sleutel voor dit certificaat kan niet geëxporteerd worden."
 }
 
 IDD_GENERAL DIALOG 0, 0, 255, 236
@@ -181,18 +190,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Installeer certificaat...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Installeer certificaat...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "Uitgevers &verklaring", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "Uitgevers &verklaring", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -201,15 +206,12 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Toon:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Wijzig eigenschappen...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Kopieer naar bestand...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Wijzig eigenschappen...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Kopieer naar bestand...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -220,8 +222,8 @@ BEGIN
   GROUPBOX "Certification &pad", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Bekijk certificaat", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Bekijk certificaat", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "Certificaat &status:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "Certificaat &status:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -233,8 +235,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "&Sluiten", IDOK,103,216,70,14
+  PUSHBUTTON "Sluiten", IDOK,73,216,85,14
-  PUSHBUTTON "Meer &informatie", IDC_CPS,177,216,70,14
+  PUSHBUTTON "Meer &informatie", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -243,20 +245,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Naam alias:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Beschrijving:", -1, 6,32,60,14
+  LTEXT "B&eschrijving:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Certificaat doeleinden", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Certificaat doeleinden", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "Schakel alle doeleinden voor dit certificaat &in",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Schakel alle doeleinden voor dit certificaat &uit",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Schakel &alleen de volgende doeleinden voor dit certificaat in:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Voeg &doeleinde toe...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Voeg &doeleinde toe...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -277,8 +279,7 @@ BEGIN
   LTEXT "Selecteer de certificatenopslag die u wilt gebruiken:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Toon fysieke opslagen", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Toon fysieke opslagen", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Annuleren", IDCANCEL, 144,118,50,14
 END
@@ -287,31 +288,29 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Certificaat importeerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Welkom bij de certificaat importeerhulp", IDC_IMPORT_TITLE,
+  LTEXT "Welkom bij de certificaat importeerhulp", IDC_IMPORT_TITLE, 115,7,195,30
-    115,1,195,40
+  LTEXT "Deze wizard helpt u certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten uit een bestand in een certificaatkluis te importeren.\n\
-  LTEXT "Deze hulp assisteert u met het importeren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten uit een bestand naar een certificatenopslag.",
+\n\
-    -1, 115,33,195,24
+Een certificaat kan gebruikt worden om u of de computer waarmee u communiceert te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Een certificaatkluis bevat een verzameling van certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten.\n\
-  LTEXT "Een certificaat kan gebruikt worden om u of de computer waarmee u werkt te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten.",
+Klik Volgende om verder te gaan.",
-    -1, 115,64,195,48
+    -1, 115,40,195,120
-  LTEXT "Klik op Volgende om verder te gaan.",
-    -1, 115,119,195,8
 END
 
-IDD_IMPORT_FILE DIALOG 0,0,317,143
+IDD_IMPORT_FILE DIALOG 0,0,317,178
 CAPTION "Certificaat importeerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Bestands&naam:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "B&laderen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Bladeren...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
-  LTEXT "NB: De volgende bestandsformaten kunnen meer dan één certificaat, certificaat terugroeplijst of certificaat vertrouwenslijst bevatten:",
+  LTEXT "Noot: De volgende bestandsformaten kunnen meer dan één certificaat, certificaat terugroeplijst of certificaat vertrouwenslijst bevatten:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Persoonlijke informatie uitwisseling/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Microsoft seriële certificatenopslag (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -319,16 +318,16 @@ CAPTION "Certificaat importeerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine kan automatisch de certificatenopslag selecteren, of u kunt een locatie opgeven voor de certificaten.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "&Automatisch certificatenopslag selecteren",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Plaats alle certificaten in de volgende opslag:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "B&laderen...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "Bladeren...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
-IDD_IMPORT_FINISH DIALOG 0,0,317,143
+IDD_IMPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Certificaat importeerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -348,20 +347,17 @@ CAPTION "Certificaten"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Doeleinden:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importeer...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Exporteren...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Verwijderen", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importeer...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "Ge&avanceerd...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Exporteer...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Verwijder", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "Ge&avanceerd...", IDC_MGR_ADVANCED, 271,172,57,14
   GROUPBOX "Certificaat doeleinden", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Bekijken...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "Bee&ld", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
-  PUSHBUTTON "&Sluiten", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "&Afsluiten", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
 IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
@@ -380,25 +376,22 @@ BEGIN
 END
 
 IDD_EXPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "Certificaat exporteerhulp"
+CAPTION "Certificaat Exporteerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Welkom bij de Certificaat exporteerhulp", IDC_EXPORT_TITLE,
+  LTEXT "Welkom bij de Certificaat exporteerhulp", IDC_EXPORT_TITLE, 115,7,195,30
-    115,1,195,40
+  LTEXT "Deze wizard helpt u certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten van een certificaatkluis naar een bestand te exporteren.\n\
-  LTEXT "Deze hulp assisteert u bij het exporteren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten vanuit een certificatenopslag naar een bestand.",
+\n\
-    -1, 115,33,195,24
+Een certificaat kan gebruikt worden om u of de computer waarmee u communiceert te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Een certificaatkluis bevat een verzameling van certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten.",
-  LTEXT "Een certificaat kan gebruikt worden om u of de computer waarmee u werkt te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten.",
+    -1, 115,40,195,120
-    -1, 115,64,195,48
-  LTEXT "Klik op Volgende om verder te gaan.",
-    -1, 115,119,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
-CAPTION "Certificaat exporteerhulp"
+CAPTION "Certificaat Exporteerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Als u de persoonlijke sleutel wilt exporteren zult u later verzocht worden een wachtwoord in te geven om de sleutel te beveiligen.", -1, 21,1,195,23
+  LTEXT "Als u de persoonlijke sleutel wilt exporteren zult u later verzocht worden een wachtwoord in te geven om de sleutel te beveiligen.", -1, 21,1,195,25
-  LTEXT "Wilt u de persoonlijke sleutel exporteren?", -1, 21,24,195,15
+  LTEXT "Wilt u de persoonlijke sleutel exporteren?", -1, 21,27,195,10
   AUTORADIOBUTTON "&Ja, exporteer de persoonlijke sleutel",
     IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Nee, exporteer de persoonlijke sleutel niet",
@@ -407,7 +400,7 @@ BEGIN
 END
 
 IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
-CAPTION "Certificaat exporteerhulp"
+CAPTION "Certificaat Exporteerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Wachtwoord:", -1, 21,1,195,10
@@ -417,48 +410,46 @@ BEGIN
 END
 
 IDD_EXPORT_FORMAT DIALOG 0,0,317,143
-CAPTION "Certificaat exporteerhulp"
+CAPTION "Certificaat Exporteerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Selecteer het formaat dat u wilt gebruiken:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-encoded X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer)",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "Neem &alle certificaten in het certificatiepad op indien mogelijk",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "&Persoonlijke informatie uitwisseling/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Nee&m alle certificaten in het certificatiepad op indien mogelijk",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Gebruikt sterke encryptie",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Verwijder de persoonlijke s&leutel als de export succesvol is",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
-CAPTION "Certificaat exporteerhulp"
+CAPTION "Certificaat Exporteerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Bestands&naam:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Bladeren...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Bladeren...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
-IDD_EXPORT_FINISH DIALOG 0,0,317,143
+IDD_EXPORT_FINISH DIALOG 0,0,317,178
-CAPTION "Certificaat exporteerhulp"
+CAPTION "Certificaat Exporteerhulp"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Afronden van de Certificaat exporteerhulp", IDC_EXPORT_TITLE,
     115,1,195,40
   LTEXT "U heeft de Certificaat exporteerhulp succesvol afgerond.",
     -1, 115,33,195,24
-  LTEXT "U heeft de volgende instellingen gespecificeerd:",
+  LTEXT "U heeft de volgende instellingen ingegeven:",
     -1, 115,57,195,12
   CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,

reactos/dll/win32/cryptui/cryptui_No.rc

@@ -1,7 +1,7 @@
 /*
- * cryptui dll resources (Norwegian Bokmål)
+ * cryptui dll resources
  *
- * Copyright 2010 Alexander N. Sørnes <alex@thehandofagony.com>
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,7 @@
 
 #include "cryptuires.h"
 
-#pragma code_page(65001)
+LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
-
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
 {
@@ -91,7 +89,10 @@ STRINGTABLE
     IDS_IMPORT_CONTENT "Innhold"
     IDS_IMPORT_CONTENT_CERT "Sertifikat"
     IDS_IMPORT_CONTENT_CRL "Liste over tilbakekalte sertifikater"
-    IDS_IMPORT_CONTENT_CTL "Liste over tiltrodde sertifikater"
+    IDS_IMPORT_CONTENT_CTL "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Tillitsliste for sertifikater\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Liste over tiltrodde sertifikater"
     IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 meldinger"
     IDS_IMPORT_CONTENT_PFX "Personlig informasjonsutveksling"
     IDS_IMPORT_CONTENT_STORE "Sertifikatlager"
@@ -106,46 +107,96 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Vennlig navn"
     IDS_ALLOWED_PURPOSE_ALL "<Alle>"
     IDS_ALLOWED_PURPOSE_NONE "<Ingen>"
-    IDS_WARN_REMOVE_MY "Du vil ikke lenger ha mulighet til å dekryptere meldinger med dette sertifikatet, eller til å signere med det.\nEr du sikker på at du vil fjerne dette sertifikatet?"
+    IDS_WARN_REMOVE_MY "Du vil ikke lenger ha mulighet til å dekryptere meldinger med dette sertifikatet, eller til å signere med det.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Du vil ikke lenger ha mulighet til å dekryptere meldinger med disse sertifikatene, eller til å signere med dem.\nEr du sikker på at du vil fjerne disse sertifikatene?"
+Er du sikker på at du vil fjerne dette sertifikatet?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Du vil ikke lenger ha mulighet til å kryptere meldinger med dette sertifikatet, eller til å kontrollere meldinger som er signert med det.\nEr du sikker på at du vil fjerne dette sertifikatet?"
+    IDS_WARN_REMOVE_PLURAL_MY "Du vil ikke lenger ha mulighet til å dekryptere meldinger med disse sertifikatene, eller til å signere med dem.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Du vil ikke lenger ha mulighet til å kryptere meldinger med disse sertifikatene, eller til å kontrollere meldinger som er signert med dem.\nEr du sikker på at du vil fjerne disse sertifikatene?"
+Er du sikker på at du vil fjerne disse sertifikatene?"
-    IDS_WARN_REMOVE_CA "Sertifikater utstedt av denne sertifiseringsenheten vil ikke lenger være tiltrodd.\nEr du sikker på at du vil fjerne dette sertifikatet?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Du vil ikke lenger ha mulighet til å kryptere meldinger med dette sertifikatet, eller til å kontrollere meldinger som er signert med det.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Sertifikater utstedt av disse sertifiseringsenhetene vil ikke lenger være tiltrodde.\nEr du sikker på at du vil fjerne disse sertifikatene?"
+Er du sikker på at du vil fjerne dette sertifikatet?"
-    IDS_WARN_REMOVE_ROOT "Sertifikater utstedt av denne rotsertifikatenheten, eller underenheter av denne, vil ikke lenger være tiltrodd.\nEr du sikker på at du vil fjerne dette rotsertifikatet?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Du vil ikke lenger ha mulighet til å kryptere meldinger med disse sertifikatene, eller til å kontrollere meldinger som er signert med dem.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Sertifikater utstedt av disse rotsertifikatenhetene, eller underenheter av disse, vil ikke lenger være tiltrodde.\nEr du sikker på at du vil fjerne disse rotsertifikatene?"
+Er du sikker på at du vil fjerne disse sertifikatene?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Programvare signert av denne utgiveren vil ikke lenger være tiltrodd.\nEr du sikker på at du vil fjerne dette sertifikatet?"
+    IDS_WARN_REMOVE_CA "Sertifikater utstedt av denne sertifiseringsenheten vil ikke lenger være tiltrodd.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Programvare signert av disse utgiverne vil ikke lenger være tiltrodd.\nEr du sikker på at du vil fjerne disse sertifikatene?"
+Er du sikker på at du vil fjerne dette sertifikatet?"
+    IDS_WARN_REMOVE_PLURAL_CA "Sertifikater utstedt av disse sertifiseringsenhetene vil ikke lenger være tiltrodde.\n\
+Er du sikker på at du vil fjerne disse sertifikatene?"
+    IDS_WARN_REMOVE_ROOT "Sertifikater utstedt av denne rotsertifikatenheten, eller underenheter av denne, vil ikke lenger være tiltrodd.\n\
+Er du sikker på at du vil fjerne dette rotsertifikatet?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Sertifikater utstedt av disse rotsertifikatenhetene, eller underenheter av disse, vil ikke lenger være tiltrodde.\n\
+Er du sikker på at du vil fjerne disse rotsertifikatene?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Programvare signert av denne utgiveren vil ikke lenger være tiltrodd.\n\
+Er du sikker på at du vil fjerne dette sertifikatet?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Programvare signert av disse utgiverne vil ikke lenger være tiltrodd.\n\
+Er du sikker på at du vil fjerne disse sertifikatene?"
     IDS_WARN_REMOVE_DEFAULT "Er du sikker på at du vil fjerne dette sertifikatet?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Er du sikker på at du vil fjerne disse sertifikatene?"
     IDS_CERT_MGR "Sertifikater"
     IDS_FRIENDLY_NAME_NONE "<Ingen>"
     IDS_PURPOSE_SERVER_AUTH "Kontrollerer identiteten til en ekstern datamaskin"
     IDS_PURPOSE_CLIENT_AUTH "Bekrefter din identitet overfor en ekstern datamaskin"
-    IDS_PURPOSE_CODE_SIGNING "Forsikrer at programvare kommer fra den originale utgiveren\nBeskytter programvare mot endringer"
+    IDS_PURPOSE_CODE_SIGNING "Forsikrer at programvare kommer fra den originale utgiveren\n\
+Beskytter programvare mot endringer"
     IDS_PURPOSE_EMAIL_PROTECTION "Beskytter e-postmeldinger"
     IDS_PURPOSE_IPSEC "Muliggjør sikker kommunikasjon over Internett"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Gjør det mulig å signere data med klokkeslett"
     IDS_PURPOSE_CTL_USAGE_SIGNING "Gjør det mulig å signere en liste over tiltrodde sertifikater digitalt"
     IDS_PURPOSE_EFS "Gjør det mulig å kryptere data på disken"
     IDS_PURPOSE_EFS_RECOVERY "Filgjenoppretting"
-    IDS_PURPOSE_WHQL "Kontroll av maskinvaredrivere for Windows"
+    IDS_PURPOSE_WHQL "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_NT5 "Kontroll av systemkomponenter for Windows"
+Windows maskinvaredriver-godkjenning\n\
-    IDS_PURPOSE_OEM_WHQL "Kontroll av Windows-komponenter fra PC-leverandører"
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_EMBEDDED_NT "Kontroll av innebygde Windows-komponenter"
+Kontroll av maskinvaredrivere for Windows"
-    IDS_PURPOSE_ROOT_LIST_SIGNER "Rotsignerer for lister"
+    IDS_PURPOSE_NT5 "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_QUALIFIED_SUBORDINATION "Kvalifisert underenhet"
+Windows sytemkomponent-godkjenning\n\
-    IDS_PURPOSE_KEY_RECOVERY "Gjenoppretting av nøkler"
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kontroll av systemkomponenter for Windows"
+    IDS_PURPOSE_OEM_WHQL "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+OEM Windows systemkomponent-godkjenning\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kontroll av Windows-komponenter fra PC-leverandører"
+    IDS_PURPOSE_EMBEDDED_NT "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Innebygget Windows systemkomponent-godkjenning\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kontroll av innebygde Windows-komponenter"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Rotlistesignerer\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Rotsignerer for lister"
+    IDS_PURPOSE_QUALIFIED_SUBORDINATION "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kvalifisert underordinering\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kvalifisert underenhet"
+    IDS_PURPOSE_KEY_RECOVERY "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Nøkkelgjenoppretting\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Gjenoppretting av nøkler"
     IDS_PURPOSE_DOCUMENT_SIGNING "Dokumentsignering"
-    IDS_PURPOSE_LIFETIME_SIGNING "Livstidssignering"
+    IDS_PURPOSE_LIFETIME_SIGNING "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_DRM "Kontroll av opphavsrett"
+Livstidsignering\n\
-    IDS_PURPOSE_LICENSES "Lisenser for nøkkelpakker"
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_LICENSE_SERVER "Kontroll av lisenstjener"
+Livstidssignering"
+    IDS_PURPOSE_DRM "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Digitale rettigheter\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kontroll av opphavsrett"
+    IDS_PURPOSE_LICENSES "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Nøkkelpakkelisenser\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Lisenser for nøkkelpakker"
+    IDS_PURPOSE_LICENSE_SERVER "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Lisenstjener-verifisering\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kontroll av lisenstjener"
     IDS_PURPOSE_ENROLLMENT_AGENT "Agent for sertifikatforespørsler"
     IDS_PURPOSE_SMARTCARD_LOGON "Smart Card-pålogging"
     IDS_PURPOSE_CA_EXCHANGE "Arkivering av private nøkler"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent for gjenoppretting av nøkler"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Kopiering av e-post fra katalogtjenester"
+Agent for nøkkelgjenoppretting\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Agent for gjenoppretting av nøkler"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Katalogtjeneste e-postreplikering\n\
+#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n\
+Kopiering av e-post fra katalogtjenester"
     IDS_EXPORT_WIZARD "Veiviser for eksport av sertifikater"
     IDS_EXPORT_FORMAT_TITLE "Eksportformat"
     IDS_EXPORT_FORMAT_SUBTITLE "Velg formatet du vil lagre innholdet i."
@@ -181,18 +232,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Installer sertifikat...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Installer sertifikat...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "Info fra ut&steder", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "Info fra ut&steder", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -201,15 +248,12 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Vi&s:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "R&ediger egenskaper...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Kopier til fil...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "R&ediger egenskaper...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Kopier til fil...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -220,8 +264,8 @@ BEGIN
   GROUPBOX "Sertifiseringsst&i", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Vis sertifikat", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Vis sertifikat", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "Sertifikatstatu&s:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "Sertifikatstatu&s:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -233,8 +277,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Lukk", IDOK,103,216,70,14
+  PUSHBUTTON "Lukk", IDOK,73,216,85,14
-  PUSHBUTTON "Mer &info", IDC_CPS,177,216,70,14
+  PUSHBUTTON "Mer &info", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -243,20 +287,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Vennlig navn:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Beskrivelse:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Sertifikatformål", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Sertifikatformål", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "Bruk sertifikat&et til alle mulige formål",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ikke bruk dette sertifikatet til noen formål",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Bruk sertifikatet kun til følgende f&ormål:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Legg til &formål...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Legg til &formål...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -277,8 +321,7 @@ BEGIN
   LTEXT "Velg sertifikatlageret du vil bruke:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "Vi&s fysiske lagre", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "Vi&s fysiske lagre", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Avbryt", IDCANCEL, 144,118,50,14
 END
@@ -287,14 +330,9 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Veiviser for import av sertifikater"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Velkommen til veiviseren for import av sertifikater", IDC_IMPORT_TITLE,
+  LTEXT "Velkommen til veiviseren for import av sertifikater", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Denne veiviseren hjelper deg å importere sertifikater og lister over tiltrodde eller tilbakekalte sertifikater fra en fil til et sertifikatlager.",
-    -1, 115,26,195,25
   LTEXT "Et sertifikat kan brukes til å identifisere deg eller datamaskinen du kommuniserer med. Det kan også brukes til signering av meldinger eller andre former for godkjenning. Sertifikatlagre er samlinger av sertifikater og lister over tiltrodde eller tilbakekalte sertifikater.",
-    -1, 115,56,195,40
+    -1, 115,40,195,120
-  LTEXT "Trykk «Neste» for å fortsette.",
-    -1, 115,103,195,8
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
@@ -303,15 +341,15 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Filnavn:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "Bla...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Bla", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Merk:  Følgende filformater kan inneholde mer enn ett sertifikat eller liste over tiltrodde eller tilbakekalte sertifikater:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Standardformat for kryptografiske meldinger/PKCS #7 Messages (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Personlig informasjonsutveksling/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Microsoft Serialized Certificate Store (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -319,13 +357,13 @@ CAPTION "Veiviser for import av sertifikater"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine kan velge sertifikatlageret automatisk, eller du kan oppgi en plassering for sertifikatene selv.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "Velg sertifikatlager &automatisk",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Plasser aller sertifikatene i følgende lager:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Bla...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "Bla", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
@@ -348,19 +386,16 @@ CAPTION "Sertifikater"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Tilte&nkt formål:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importér...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Eksporter...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Fjern", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importér...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Avansert...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Eksportér...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "Fje&rn", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Avansert...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Sertifikatets tiltenkte formål", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Vis...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Vis", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Lukk", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -383,14 +418,9 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Veiviser for eksport av sertifikater"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Velkommen til veiviseren for eksport av sertifikater", IDC_EXPORT_TITLE,
+  LTEXT "Velkommen til veiviseren for eksport av sertifikater", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Denne veiviseren hjelper deg med å eksportere sertifikater og lister over tiltrodde eller tilbakekalte sertifikater fra et sertifikatlager til en fil.",
-    -1, 115,26,195,25
   LTEXT "Et sertifikat kan brukes til å identifisere deg eller datamaskinen du kommuniserer med. Det kan også brukes til signering av meldinger eller andre former for godkjenning. Sertifikatlagre er samlinger av sertifikater og lister over tiltrodde eller tilbakekalte sertifikater.",
-    -1, 115,56,195,40
+    -1, 115,40,195,120
-  LTEXT "Trykk «Neste» for å fortsette.",
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
@@ -422,23 +452,21 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Velg formatet du ønsker å bruke:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-kodet X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ba&se64-kodet X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Standardformat for &kryptografiske meldinger/PKCS #7 Message (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "Ta med alle sertifikater &i sertifikatstien, hvis mulig",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "&Personlig informasjonsutveksling/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Ta med aller sertifikater i sertifikatstien, hvis m&ulig",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Bruk st&erk kryptering",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Slett den private nø&kkelen hvis eksporten er vellykket",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
@@ -447,7 +475,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Filnavn:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Bla...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Bla", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
 IDD_EXPORT_FINISH DIALOG 0,0,317,178

reactos/dll/win32/cryptui/cryptui_Pl.rc

@@ -1,7 +1,7 @@
 /*
  * cryptui dll resources
  *
- * Copyright 2010 Łukasz Wojniłowicz
+ * Copyright 2008 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,200 +26,204 @@ STRINGTABLE
 {
     IDS_CERTIFICATE "Certyfikat"
     IDS_CERTIFICATEINFORMATION "Informacje o certyfikacie"
-    IDS_CERT_INFO_BAD_SIG "Ten certyfikat ma niewłaściwą sygnaturę. Certyfikat mógł zostać zmieniony lub uszkodzony."
+    IDS_CERT_INFO_BAD_SIG "Ten certyfikat ma niewłaściwą sygnaturę. Certyfikat mógł zostać zmieniony lub uszkodzony."
-    IDS_CERT_INFO_UNTRUSTED_CA "Ten główny certyfikat jest niezaufany.  Aby był zaufany, dodaj go do systemowego magazynu zaufanych głównych certyfikatów."
+    IDS_CERT_INFO_UNTRUSTED_CA "Ten główny certyfikat jest niezaufany.  Aby był zaufany, dodaj go do systemowego magazynu zaufanych głównych certyfikatów."
-    IDS_CERT_INFO_UNTRUSTED_ROOT "Ten certyfikat nie mógł być potwierdzony jako zaufany główny certyfikat."
+    IDS_CERT_INFO_UNTRUSTED_ROOT "Ten certyfikat nie mógł być potwierdzony jako zaufany główny certyfikat."
     IDS_CERT_INFO_PARTIAL_CHAIN "Nie znaleziono wydawcy tego certyfikatu."
-    IDS_CERT_INFO_BAD_PURPOSES "Nie można było zweryfikować wszystkich zamierzonych celów tego certyfikatu."
+    IDS_CERT_INFO_BAD_PURPOSES "Nie można było zweryfikować wszystkich zamierzonych celów tego certyfikatu."
-    IDS_CERT_INFO_PURPOSES "Ten certyfikat jest zamierzony na następujące cele:"
+    IDS_CERT_INFO_PURPOSES "Ten certyfikat jest zamierzony na następujące cele:"
     IDS_SUBJECT_HEADING "Wystawiony dla: "
     IDS_ISSUER_HEADING "Wystawiony przez: "
-    IDS_VALID_FROM "Ważny od "
+    IDS_VALID_FROM "Ważny od "
     IDS_VALID_TO " do "
-    IDS_CERTIFICATE_BAD_SIGNATURE "Ten certyfikat ma niewłaściwą sygnaturę."
+    IDS_CERTIFICATE_BAD_SIGNATURE "Ten certyfikat ma niewłaściwą sygnaturę."
-    IDS_CERTIFICATE_BAD_TIME "Ten certyfikat wygasł lub nie uzyskał jeszcze ważności."
+    IDS_CERTIFICATE_BAD_TIME "Ten certyfikat wygasł lub nie uzyskał jeszcze ważności."
-    IDS_CERTIFICATE_BAD_TIMENEST "Okres ważności tego certyfikatu przekracza ten określony przez jego wydawcę."
+    IDS_CERTIFICATE_BAD_TIMENEST "Okres ważności tego certyfikatu przekracza ten określony przez jego wydawcę."
-    IDS_CERTIFICATE_REVOKED "Ten certyfikat został odwołany przez własny urząd certyfikacji."
+    IDS_CERTIFICATE_REVOKED "Ten certyfikat został odwołany przez własny urząd certyfikacji."
     IDS_CERTIFICATE_VALID "Ten certyfikat jest OK."
     IDS_FIELD "Pole"
-    IDS_VALUE "Wartość"
+    IDS_VALUE "Wartość"
     IDS_FIELDS_ALL "<Wszyscy>"
     IDS_FIELDS_V1 "Tylko pola wersji 1"
     IDS_FIELDS_EXTENSIONS "Tylko rozszerzenia"
     IDS_FIELDS_CRITICAL_EXTENSIONS "Tylko rozszerzenia krytyczne"
-    IDS_FIELDS_PROPERTIES "Tylko właściwości"
+    IDS_FIELDS_PROPERTIES "Tylko właściwości"
     IDS_FIELD_VERSION "Wersja"
     IDS_FIELD_SERIAL_NUMBER "Numer seryjny"
     IDS_FIELD_ISSUER "Wystawca"
-    IDS_FIELD_VALID_FROM "Ważny od"
+    IDS_FIELD_VALID_FROM "Ważny od"
-    IDS_FIELD_VALID_TO "Ważny do"
+    IDS_FIELD_VALID_TO "Ważny do"
     IDS_FIELD_SUBJECT "Podmiot"
     IDS_FIELD_PUBLIC_KEY "Klucz publiczny"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bitów)"
-    IDS_PROP_HASH "SHA1 hash"
+    IDS_PROP_HASH "Odcisk palca"
-    IDS_PROP_ENHKEY_USAGE "Użycie klucza rozszerzonego (właściwość)"
+    IDS_PROP_ENHKEY_USAGE "Użycie klucza rozszerzonego (właściwość)"
     IDS_PROP_FRIENDLY_NAME "Przyjazna nazwa"
     IDS_PROP_DESCRIPTION "Opis"
-    IDS_CERTIFICATE_PROPERTIES "Właściwości certyfikatu"
+    IDS_CERTIFICATE_PROPERTIES "Właściwości certyfikatu"
-    IDS_CERTIFICATE_PURPOSE_ERROR "Proszę podać OID w formie 1.2.3.4"
+    IDS_CERTIFICATE_PURPOSE_ERROR "Proszę podać OID w formie 1.2.3.4"
-    IDS_CERTIFICATE_PURPOSE_EXISTS "Podane OID już istnieje."
+    IDS_CERTIFICATE_PURPOSE_EXISTS "Podane OID już istnieje."
-    IDS_SELECT_STORE_TITLE "Wybór magazynu certyfikatów"
+    IDS_SELECT_STORE_TITLE "Wybór magazynu certyfikatów"
-    IDS_SELECT_STORE "Proszę wybrać magazyn certyfikatów."
+    IDS_SELECT_STORE "Proszę wybrać magazyn certyfikatów."
-    IDS_IMPORT_WIZARD "Kreator importu certyfikatów"
+    IDS_IMPORT_WIZARD "Kreator importu certyfikatów"
-    IDS_IMPORT_TYPE_MISMATCH "Plik zawiera obiekty niezgodne z zadanymi kryteriami. Proszę wybrać inny plik."
+    IDS_IMPORT_TYPE_MISMATCH "Plik zawiera obiekty niezgodne z zadanymi kryteriami. Proszę wybrać inny plik."
     IDS_IMPORT_FILE_TITLE "Import pliku"
-    IDS_IMPORT_FILE_SUBTITLE "Wybierz plik, który chcesz zaimportować."
+    IDS_IMPORT_FILE_SUBTITLE "Wybierz plik, który chcesz zaimportować."
-    IDS_IMPORT_STORE_TITLE "Magazyn certyfikatów"
+    IDS_IMPORT_STORE_TITLE "Magazyn certyfikatów"
-    IDS_IMPORT_STORE_SUBTITLE "Magazyn certyfikatów jest zbiorem certyfikatów, list odwołania certyfikatu oraz list zaufania certyfikatu."
+    IDS_IMPORT_STORE_SUBTITLE "Magazyn certyfikatów jest zbiorem certyfikatów, list odwołania certyfikatu oraz list zaufania certyfikatu."
     IDS_IMPORT_FILTER_CERT "Certyfikat X.509 (*.cer; *.crt)"
     IDS_IMPORT_FILTER_PFX "Wymiana informacji osobistych (*.pfx; *.p12)"
-    IDS_IMPORT_FILTER_CRL "Lista odwołania certyfikatu (*.crl)"
+    IDS_IMPORT_FILTER_CRL "Lista odwołania certyfikatu (*.crl)"
     IDS_IMPORT_FILTER_CTL "Lista zaufania certyfikatu (*.stl)"
-    IDS_IMPORT_FILTER_SERIALIZED_STORE "Magazyn certyfikatów seryjnych firmy Microsoft (*.sst)"
+    IDS_IMPORT_FILTER_SERIALIZED_STORE "Magazyn certyfikatów seryjnych firmy Microsoft (*.sst)"
     IDS_IMPORT_FILTER_CMS "Certyfikaty CMS/PKCS #7 (*.spc; *.p7b)"
     IDS_IMPORT_FILTER_ALL "Wszystkie pliki (*.*)"
-    IDS_IMPORT_EMPTY_FILE "Proszę wybrać plik."
+    IDS_IMPORT_EMPTY_FILE "Proszę wybrać plik."
-    IDS_IMPORT_BAD_FORMAT "Nie rozpoznano typu pliku.  Proszę wybrać inny plik."
+    IDS_IMPORT_BAD_FORMAT "Nie rozpoznano typu pliku.  Proszę wybrać inny plik."
-    IDS_IMPORT_OPEN_FAILED "Nie można otworzyć "
+    IDS_IMPORT_OPEN_FAILED "Nie można otworzyć "
-    IDS_IMPORT_DEST_DETERMINED "Określone przez program"
+    IDS_IMPORT_DEST_DETERMINED "Określone przez program"
-    IDS_IMPORT_SELECT_STORE "Proszę wybierz magazyn"
+    IDS_IMPORT_SELECT_STORE "Proszę wybierz magazyn"
-    IDS_IMPORT_STORE_SELECTION "Magazyn certyfikatów wybrany"
+    IDS_IMPORT_STORE_SELECTION "Magazyn certyfikatów wybrany"
-    IDS_IMPORT_DEST_AUTOMATIC "Automatycznie określony przez program"
+    IDS_IMPORT_DEST_AUTOMATIC "Automatycznie określony przez program"
     IDS_IMPORT_FILE "Plik"
-    IDS_IMPORT_CONTENT "Zawartość"
+    IDS_IMPORT_CONTENT "Treść"
     IDS_IMPORT_CONTENT_CERT "Certyfikat"
-    IDS_IMPORT_CONTENT_CRL "Lista odwołania certyfikatu"
+    IDS_IMPORT_CONTENT_CRL "Lista odwołania certyfikatu"
     IDS_IMPORT_CONTENT_CTL "Lista zaufania certyfikatu"
     IDS_IMPORT_CONTENT_CMS "Certyfikat CMS/PKCS #7"
     IDS_IMPORT_CONTENT_PFX "Wymiana informacji osobistych"
-    IDS_IMPORT_CONTENT_STORE "Magazyn certyfikatu"
+    IDS_IMPORT_CONTENT_STORE "Magazyn certyfikatów"
-    IDS_IMPORT_SUCCEEDED "Import zakończył się pomyślnie."
+    IDS_IMPORT_SUCCEEDED "Import zakończył się pomyślnie."
-    IDS_IMPORT_FAILED "Import zakończył się niepowodzeniem."
+    IDS_IMPORT_FAILED "Import zakończył się niepowodzeniem."
     IDS_WIZARD_TITLE_FONT "Arial"
     IDS_PURPOSE_ALL "<Wszyscy>"
     IDS_PURPOSE_ADVANCED "<Cele zaawansowane>"
     IDS_SUBJECT_COLUMN "Wystawiony dla"
     IDS_ISSUER_COLUMN "Wystawiony przez"
-    IDS_EXPIRATION_COLUMN "Data wygaśnięcia"
+    IDS_EXPIRATION_COLUMN "Data wygaśnięcia"
     IDS_FRIENDLY_NAME_COLUMN "Przyjazna nazwa"
-    IDS_ALLOWED_PURPOSE_ALL "<Wszystkie>"
+    IDS_ALLOWED_PURPOSE_ALL "<Wszyscy>"
     IDS_ALLOWED_PURPOSE_NONE "<Brak>"
-    IDS_WARN_REMOVE_MY "Już nie będziesz mógł odszyfrowywać i podpisywać wiadomości tym certyfikatem.\nCzy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_MY "Już nie będziesz mógł odszyfrowywać i podpisywać wiadomości tym certyfikatem.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Już nie będziesz mógł odszyfrowywać i podpisywać wiadomości tymi certyfikatami.\nCzy jesteś pewien, że chcesz usunąć te certyfikaty?"
+Czy jesteś pewien, że chcesz usunąć ten certyfikat?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Już nie będziesz mógł szyfrować i weryfikować wiadomości podpisanych tym certyfikatem.\nCzy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_PLURAL_MY "Już nie będziesz mógł odszyfrowywać i podpisywać wiadomości tymi certyfikatami.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Już nie będziesz mógł szyfrować i weryfikować wiadomości podpisanych tymi certyfikatami.\nCzy jesteś pewien, że chcesz usunąć te certyfikaty?"
+Czy jesteś pewien, że chcesz usunąć te certyfikaty?"
-    IDS_WARN_REMOVE_CA "Certyfikaty wydane przez ten urząd certyfikacji stracą zaufanie.\nCzy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Już nie będziesz mógł szyfrować i weryfikować wiadomości podpisanych tym certyfikatem.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Certyfikaty wydane przez te urzędy certyfikacji stracą zaufanie.\nCzy jesteś pewien, że chcesz usunąć te certyfikaty?"
+Czy jesteś pewien, że chcesz usunąć ten certyfikat?"
-    IDS_WARN_REMOVE_ROOT "Certyfikaty wydane przez ten główny urząd certyfikacji, albo jakiekolwiek urzędy certyfikacji, które wydał, stracą zaufanie.\nCzy jesteś pewien, że chcesz usunąć ten główny zaufany certyfikat?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Już nie będziesz mógł szyfrować i weryfikować wiadomości podpisanych tymi certyfikatami.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Certyfikaty wydane przez te główne urzędy certyfikacji, albo jakiekolwiek urzędy certyfikacji, które wydały, stracą zaufanie.\nCzy jesteś pewien, że chcesz usunąć te główne zaufane certyfikaty?"
+Czy jesteś pewien, że chcesz usunąć te certyfikaty?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Oprogramowanie podpisane przez tego wydawce stracą zaufanie.\nCzy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_CA "Certyfikaty wydane przez ten urząd certyfikacji stracą zaufanie.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Oprogramowanie podpisane przez tych wydawców stracą zaufanie.\nCzy jesteś pewien, że chcesz usunąć te certyfikaty?"
+Czy jesteś pewien, że chcesz usunąć ten certyfikat?"
-    IDS_WARN_REMOVE_DEFAULT "Czy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_PLURAL_CA "Certyfikaty wydane przez te urzędy certyfikacji stracą zaufanie.\n\
-    IDS_WARN_REMOVE_PLURAL_DEFAULT "Czy jesteś pewien, że chcesz usunąć te certyfikaty?"
+Czy jesteś pewien, że chcesz usunąć te certyfikaty?"
+    IDS_WARN_REMOVE_ROOT "Certyfikaty wydane przez ten główny urząd certyfikacji, albo jakiekolwiek urzędy certyfikacji, które wydał, stracą zaufanie.\n\
+Czy jesteś pewien, że chcesz usunąć ten główny zaufany certyfikat?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Certyfikaty wydane przez te główne urzędy certyfikacji, albo jakiekolwiek urzędy certyfikacji, które wydały, stracą zaufanie.\n\
+Czy jesteś pewien, że chcesz usunąć te główne zaufane certyfikaty?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Oprogramowanie podpisane przez tego wydawce stracą zaufanie.\n\
+Czy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Oprogramowanie podpisane przez tych wydawców stracą zaufanie.\n\
+Czy jesteś pewien, że chcesz usunąć te certyfikaty?"
+    IDS_WARN_REMOVE_DEFAULT "Czy jesteś pewien, że chcesz usunąć ten certyfikat?"
+    IDS_WARN_REMOVE_PLURAL_DEFAULT "Czy jesteś pewien, że chcesz usunąć te certyfikaty?"
     IDS_CERT_MGR "Certyfikaty"
     IDS_FRIENDLY_NAME_NONE "<Brak>"
-    IDS_PURPOSE_SERVER_AUTH "Zapewnia identyfikację komputera zdalnego"
+    IDS_PURPOSE_SERVER_AUTH "Zapewnia identyfikację komputera zdalnego"
-    IDS_PURPOSE_CLIENT_AUTH "Zapewnia tobie identyfikację dla komputera zdalnego"
+    IDS_PURPOSE_CLIENT_AUTH "Zapewnia tobie identyfikację dla komputera zdalnego"
-    IDS_PURPOSE_CODE_SIGNING "Zapewnia, że oprogramowanie pochodzi od wydawcy oprogramowania\nChroni oprogramowanie przed zmianą po wydaniu"
+    IDS_PURPOSE_CODE_SIGNING "Zapewnia, że oprogramowanie pochodzi od wydawcy oprogramowania\n\
-    IDS_PURPOSE_EMAIL_PROTECTION "Chroni wiadomości e-mail"
+Chroni oprogramowanie przed zmianą po wydaniu"
-    IDS_PURPOSE_IPSEC "Pozwala na bezpieczną komunikację przez internet"
+    IDS_PURPOSE_EMAIL_PROTECTION "Chroni wiadomości e-mail"
+    IDS_PURPOSE_IPSEC "Pozwala na bezpieczną komunikację przez internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Pozwala na podpisywanie danych z aktualnym czasem"
     IDS_PURPOSE_CTL_USAGE_SIGNING "Pozwala na cyfrowy podpis listy zaufania certyfikatu"
     IDS_PURPOSE_EFS "Pozwala na szyfrowanie danych na dysku"
-    IDS_PURPOSE_EFS_RECOVERY "Odzyskiwanie plików"
+    IDS_PURPOSE_EFS_RECOVERY "Odzyskiwanie plików"
-    IDS_PURPOSE_WHQL "Weryfikacja sprzętowych sterowników systemu Windows"
+    IDS_PURPOSE_WHQL "Weryfikacja sprzętowych sterowników systemu Windows"
-    IDS_PURPOSE_NT5 "Weryfikacja składników systemowych Windows"
+    IDS_PURPOSE_NT5 "Weryfikacja składników systemowych Windows"
-    IDS_PURPOSE_OEM_WHQL "Weryfikacja składników systemu Windows OEM"
+    IDS_PURPOSE_OEM_WHQL "Weryfikacja składników systemu Windows OEM"
-    IDS_PURPOSE_EMBEDDED_NT "Weryfikacja osadzonych składników systemu Windows"
+    IDS_PURPOSE_EMBEDDED_NT "Weryfikacja osadzonych składników systemu Windows"
-    IDS_PURPOSE_ROOT_LIST_SIGNER "Główna lista podpisujących"
+    IDS_PURPOSE_ROOT_LIST_SIGNER "Moduł podpisywania listy głównej"
     IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordynacja kwalifikowana"
     IDS_PURPOSE_KEY_RECOVERY "Odzyskiwanie kluczy"
     IDS_PURPOSE_DOCUMENT_SIGNING "Podpisywanie dokumentu"
-    IDS_PURPOSE_LIFETIME_SIGNING "Podpisywanie dożywotnie"
+    IDS_PURPOSE_LIFETIME_SIGNING "Podpisywanie dożywotnie"
     IDS_PURPOSE_DRM "Prawa cyfrowe"
     IDS_PURPOSE_LICENSES "Licencje pakietu kluczy"
     IDS_PURPOSE_LICENSE_SERVER "Weryfikacja serwera licencji"
-    IDS_PURPOSE_ENROLLMENT_AGENT "Agent żądania certyfikatu"
+    IDS_PURPOSE_ENROLLMENT_AGENT "Agencja żądania certyfikatu"
     IDS_PURPOSE_SMARTCARD_LOGON "Logowanie karty inteligentnej"
     IDS_PURPOSE_CA_EXCHANGE "Archiwalne klucze prywatne"
     IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent odzyskiwania kluczy"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Replikacja poczty e-mail usługi katalogowej"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "Replikacja poczty e-mail usługi katalogowej"
-    IDS_EXPORT_WIZARD "Kreator eksportu certyfikatów"
+    IDS_EXPORT_WIZARD "Kreator eksportu certyfikatów"
     IDS_EXPORT_FORMAT_TITLE "Format pliku eksportowanego"
-    IDS_EXPORT_FORMAT_SUBTITLE "Określ typ pliku, w który zawartość eksportowana zostanie zapisana."
+    IDS_EXPORT_FORMAT_SUBTITLE "Określ typ pliku, w który zawartość eksportowana zostanie zapisana."
     IDS_EXPORT_FILE_TITLE "Nazwa pliku eksportowanego"
-    IDS_EXPORT_FILE_SUBTITLE "Określ nazwę pliku, w który zawartość eksportowana zostanie zapisana."
+    IDS_EXPORT_FILE_SUBTITLE "Określ nazwę pliku, w który zawartość eksportowana zostanie zapisana."
-    IDS_EXPORT_FILE_EXISTS "Określony plik już istnieje. Czy chcesz go nadpisać?"
+    IDS_EXPORT_FILE_EXISTS "Określony plik już istnieje. Czy chcesz go nadpisać?"
     IDS_EXPORT_FILTER_CERT "Certyfikat X.509 szyfrowany binarnie algorytmem DER (*.cer)"
     IDS_EXPORT_FILTER_BASE64_CERT "Certyfikat X.509 szyfrowany algorytmem Base64 (*.cer)"
-    IDS_EXPORT_FILTER_CRL "Lista odwołania certyfikatu (*.crl)"
+    IDS_EXPORT_FILTER_CRL "Lista odwołania certyfikatu (*.crl)"
     IDS_EXPORT_FILTER_CTL "Lista zaufania certyfikatu (*.stl)"
     IDS_EXPORT_FILTER_CMS "Certyfikaty CMS/PKCS #7 (*.p7b)"
     IDS_EXPORT_FILTER_PFX "Wymiana informacji osobistych (*.pfx)"
-    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Magazyn certyfikatów seryjnych firmy Microsoft(*.sst)"
+    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Magazyn certyfikatów seryjnych firmy Microsoft(*.sst)"
     IDS_EXPORT_FORMAT "Format pliku"
-    IDS_EXPORT_INCLUDE_CHAIN "Łącznie ze wszystkimi certyfikatami w ścieżce certyfikatu"
+    IDS_EXPORT_INCLUDE_CHAIN "Łącznie ze wszystkimi certyfikatami w ścieżce certyfikatu"
     IDS_EXPORT_KEYS "Eksportowanie kluczy"
     IDS_YES "Tak"
     IDS_NO "Nie"
-    IDS_EXPORT_SUCCEEDED "Eksport zakończył się pomyślnie."
+    IDS_EXPORT_SUCCEEDED "Eksport zakończył się pomyślnie."
-    IDS_EXPORT_FAILED "Eksport zakończył się niepowodzeniem."
+    IDS_EXPORT_FAILED "Eksport zakończył się niepowodzeniem."
     IDS_EXPORT_PRIVATE_KEY_TITLE "Eksportowanie klucza prywatnego"
-    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Certyfikat zawiera klucz prywatny, który może być wyeksportowany razem z certyfikatem."
+    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Certyfikat zawiera klucz prywatny, który może być wyeksportowany razem z certyfikatem."
-    IDS_EXPORT_PASSWORD_TITLE "Podaj hasło"
+    IDS_EXPORT_PASSWORD_TITLE "Podaj hasło"
-    IDS_EXPORT_PASSWORD_SUBTITLE "Możesz chronić klucz prywatny hasłem."
+    IDS_EXPORT_PASSWORD_SUBTITLE "Możesz chronić klucz prywatny hasłem."
-    IDS_EXPORT_PASSWORD_MISMATCH "Niezgodność haseł."
+    IDS_EXPORT_PASSWORD_MISMATCH "Niezgodność haseł."
-    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Uwaga: Nie można otworzyć klucza prywatnego dla tego certyfikatu."
+    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Uwaga: Nie można otworzyć klucza prywatnego dla tego certyfikatu."
     IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Uwaga: Klucz prywatny dla tego certyfikatu jest oznaczony jako nie do eksportu."
 }
 
 IDD_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "Ogólne"
+CAPTION "Ogólne"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Zainstaluj certyfikat...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Zainstaluj certyfikat...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "&Oświadczenie wystawcy", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "&Oświadczenie wystawcy", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
-CAPTION "Szczegóły"
+CAPTION "Szczegóły"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Pokaż:", -1, 6,12,40,14
+  LTEXT "&Pokaż:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Edytuj właściwości...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Kopiuj do pliku...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Edytuj właściwości...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Kopiuj do pliku...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
-CAPTION "Ścieżka certyfikacji"
+CAPTION "Ścieżka certyfikacji"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Ścieżka &certyfikacji", -1,6,10,245,165, BS_GROUPBOX
+  GROUPBOX "Ścieżka certyfikacji", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Wyświetl certyfikat", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Wyświetl certyfikat", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "&Stan certyfikatu:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "&Stan certyfikatu:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -231,37 +235,37 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Zamknij", IDOK,103,216,70,14
+  PUSHBUTTON "Zamknij", IDOK,73,216,85,14
-  PUSHBUTTON "Więcej &informacji", IDC_CPS,177,216,70,14
+  PUSHBUTTON "Więcej &informacji", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "Ogólne"
+CAPTION "Ogólne"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Przyjazna nazwa:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Opis:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Cel certyfikatu", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Cel certyfikatu", -1,6,48,245,185, BS_GROUPBOX
-  AUTORADIOBUTTON "&Włącz wszystkie cele dla tego certyfikatu",
+  AUTORADIOBUTTON "&Włącz wszystkie cele dla tego certyfikatu",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "Wyłą&cz wszystkie cele dla tego certyfikatu",
+  AUTORADIOBUTTON "Wyłą&cz wszystkie cele dla tego certyfikatu",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "Włącz &następujące cele dla tego certyfikatu:",
+  AUTORADIOBUTTON "Włącz &następujące cele dla tego certyfikatu:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "&Dodaj cel...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "&Dodaj cel...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
 CAPTION "Dodaj cel"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Wpisz identyfikator obiektu (OID) dla celu certyfikatu, który chcesz dodać:",
+  LTEXT "Wpisz identyfikator obiektu (OID) dla celu certyfikatu, który chcesz dodać:",
     -1, 6,6,190,28
   EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
   PUSHBUTTON "OK", IDOK, 33,48,60,14
@@ -269,72 +273,70 @@ BEGIN
 END
 
 IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "Wybór magazynu certyfikatów"
+CAPTION "Wybór magazynu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Wybierz magazyn certyfikatów, który chcesz użyć:", IDC_STORE_TEXT, 6,6,190,28
+  LTEXT "Wybierz magazyn certyfikatów, który chcesz użyć:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Pokaż fizyczne magazyny", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Pokaż fizyczne magazyny", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Anuluj", IDCANCEL, 144,118,50,14
 END
 
 IDD_IMPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "Kreator importu certyfikatów"
+CAPTION "Kreator importu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Witamy w kreatorze importu certyfikatów", IDC_IMPORT_TITLE,
+  LTEXT "Witamy w kreatorze importu certyfikatów", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "Asystent ten pomaga tobie importować certyfikaty, listy odwołania certyfikatów, i listy zaufania certyfikatów z pliku do magazynu certyfikatów.\n\
-  LTEXT "Ten kreator pomoże tobie zaimportować certyfikaty, listy odwołania certyfikatu i listy zaufania certyfikatu z pliku do magazynu certyfikatów.",
+\n\
-    -1, 115,26,195,25
+Certyfikat może zostać użyty do identyfikacji ciebie lub komputer, z którym się komunikujesz. Może on również zostać wykorzystany do uwierzytelnienia i do podpisywania wiadomości. Magazyny certyfikatów są zbiorem certyfikatów, list odwołań certyfikatów oraz list zaufań certyfikatów.\n\
-  LTEXT "Certyfikat może być użyty do identyfikacji ciebie lub komputera, z którym się komunikujesz.  Może być równiez użyty do uwierzytelnienia i podpisywania wiadomości. Magazyn certyfikatów jest zbiorem certyfikatów, list odwołania certyfikatu oraz list zaufania certyfikatu.",
+\n\
-    -1, 115,56,195,40
+Aby kontynuować, naciśnij Dalej.",
-  LTEXT "Aby kontynuować, kliknij przycisk Dalej.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
-CAPTION "Kreator importu certyfikatów"
+CAPTION "Kreator importu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nazwa pliku:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Przeglądaj...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Przeglądaj", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
-  LTEXT "Uwaga:  Następujące formaty plików mogą zawierać więcej niż jeden certyfikat, listę odwołania certyfikatu lub listę zaufania certyfikatu:",
+  LTEXT "Uwaga:  Następujące formaty plików mogą zawierać więcej niż jeden certyfikat, listę odwołania certyfikatu lub listę zaufania certyfikatu:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
-  LTEXT "Standard składni wiadomości kryptograficznych - certyfikaty PKCS #7 (.p7b)",
+  LTEXT "Standard składni wiadomości kryptograficznych - certyfikaty PKCS #7 (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Wymiana informacji osobistych/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
-  LTEXT "Magazyn certyfikatów seryjnych firmy Microsoft (.sst)",
+  LTEXT "Magazyn certyfikatów seryjnych firmy Microsoft (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
-CAPTION "Kreator importu certyfikatów"
+CAPTION "Kreator importu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Wine może automatycznie wybrać magazyn certyfikatów. Możesz także ręcznie określić położenie certyfikatów.",
+  LTEXT "Wine może automatycznie wybrać magazyn certyfikatów. Możesz także ręcznie określić położenie certyfikatów.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
-  AUTORADIOBUTTON "&Automatycznie wybierz magazyn certyfikatów",
+  AUTORADIOBUTTON "&Automatycznie wybierz magazyn certyfikatów",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "&Umieść wszystkie certyfikaty w następującym magazynie:",
+  AUTORADIOBUTTON "&Umieść wszystkie certyfikaty w następującym magazynie:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Przeglądaj...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "Przeglądaj", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
-CAPTION "Kreator importu certyfikatów"
+CAPTION "Kreator importu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Kończenie pracy kreatora importu certyfikatów", IDC_IMPORT_TITLE,
+  LTEXT "Kończenie pracy kreatora importu certyfikatów", IDC_IMPORT_TITLE,
     115,1,195,40
-  LTEXT "Praca kreatora importu certyfikatów została zakończona pomyślnie.",
+  LTEXT "Praca kreatora importu certyfikatów została zakończona pomyślnie.",
     -1, 115,33,195,24
-  LTEXT "Określiłeś następujące ustawienia:",
+  LTEXT "Określiłeś następujące ustawienia:",
     -1, 115,57,195,12
   CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
@@ -346,20 +348,17 @@ CAPTION "Certyfikaty"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Zamierzone cele:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importuj...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Eksportuj...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Usuń...", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importuj...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Zaawansowane...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Eksportuj...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Usuń", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Zaawansowane...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Zamierzone cele certyfikatu", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Wyświetl...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Widok", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
-  PUSHBUTTON "Za&mknij", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "&Zamknij", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
 IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
@@ -367,7 +366,7 @@ CAPTION "Zaawansowane opcje"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Cel certyfikatu", -1, 7,7,234,141, BS_GROUPBOX
-  LTEXT "Wybierz jeden lub więcej celów, które mają być wyświetlane gdy zaznaczono Zaawansowane Cele.",
+  LTEXT "Wybierz jeden lub więcej celów, które mają być wyświetlane gdy zaznaczono Zaawansowane Cele.",
     -1, 14,18,220,16
   LTEXT "&Cele certyfikatu:", -1, 14,41,90,12, WS_TABSTOP
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
@@ -378,25 +377,24 @@ BEGIN
 END
 
 IDD_EXPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "Kreator eksportu certyfikatów"
+CAPTION "Kreator eksportu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Witamy w kreatorze eksportu certyfikatów", IDC_EXPORT_TITLE,
+  LTEXT "Witamy w kreatorze eksportu certyfikatów", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "Asystent ten pomaga tobie eksportować certyfikaty, listy odwołania certyfikatów, i listy zaufania certyfikatów z magazynu certyfikatów do pliku.\n\
-  LTEXT "Ten kreator pomoże tobie wyeksportować certyfikaty, listy odwołania certyfikatu i listy zaufania certyfikatu z magazynu certyfikatów do pliku.",
+\n\
-    -1, 115,26,195,25
+Certyfikat może zostać użyty do identyfikacji ciebie lub komputer, z którym się komunikujesz. Może on również zostać wykorzystany do uwierzytelnienia i do podpisywania wiadomości. Magazyny certyfikatów są zbiorem certyfikatów, list odwołań certyfikatów oraz list zaufań certyfikatów.\n\
-  LTEXT "Certyfikat może być użyty do identyfikacji ciebie lub komputera, z którym się komunikujesz.  Może być równiez użyty do uwierzytelnienia i podpisywania wiadomości. Magazyn certyfikatów jest zbiorem certyfikatów, list odwołania certyfikatu oraz list zaufania certyfikatu.",
+\n\
-    -1, 115,56,195,40
+Aby kontynuować, naciśnij Dalej.",
-  LTEXT "Aby kontynuować, kliknij przycisk Dalej.",
+    -1, 115,40,195,120
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
-CAPTION "Kreator eksportu certyfikatów"
+CAPTION "Kreator eksportu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Jeżeli wybierzesz wyeksportowanie klucza prywatnego to w kolejnym kroku będziesz zapytany o hasło chroniące klucz prywatny.", -1, 21,1,195,25
+  LTEXT "Jeżeli wybierzesz wyeksportowanie klucza prywatnego to w kolejnym kroku będziesz zapytany o hasło chroniące klucz prywatny.", -1, 21,1,195,25
-  LTEXT "Czy chcesz wyeksportować klucz prywatny?", -1, 21,27,195,10
+  LTEXT "Czy chcesz wyeksportować klucz prywatny?", -1, 21,27,195,10
   AUTORADIOBUTTON "&Tak, eksportuj klucz prywatny",
     IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Nie, nie eksportuj klucza prywatnego",
@@ -405,58 +403,56 @@ BEGIN
 END
 
 IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
-CAPTION "Kreator eksportu certyfikatów"
+CAPTION "Kreator eksportu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Hasło:", -1, 21,1,195,10
+  LTEXT "&Hasło:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Potwierdź hasło:", -1, 21,35,195,10
+  LTEXT "&Potwierdź hasło:", -1, 21,35,195,10
   EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
 END
 
 IDD_EXPORT_FORMAT DIALOG 0,0,317,143
-CAPTION "Kreator eksportu certyfikatów"
+CAPTION "Kreator eksportu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Wybierz format, którego chcesz użyć:", -1, 21,1,195,10
+  LTEXT "Wybierz format, którego chcesz użyć:", -1, 21,1,195,10
   AUTORADIOBUTTON "Certyfikat X.509 szyfrowany binarnie algorytmem DER (.&cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Certyfikat X.509 szyfrowany algorytmem B&ase64 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "&Standard składni wiadomości kryptograficznych - certyfikat PKCS #7 (.p7b)",
+  AUTORADIOBUTTON "&Standard składni wiadomości kryptograficznych - certyfikat PKCS #7 (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
-  CHECKBOX "&Jeżeli jest to możliwe, dołącz wszystkie certyfikaty do ścieżki certyfikacji",
+  CHECKBOX "&Jeżeli jest to możliwe, dołącz wszystkie certyfikaty do ścieżki certyfikacji",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "Wymiana informacji &osobistych - PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
-  CHECKBOX "J&eżeli jest to możliwe, dołącz wszystkie certyfikaty do ścieżki certyfikacji",
+  CHECKBOX "J&eżeli jest to możliwe, dołącz wszystkie certyfikaty do ścieżki certyfikacji",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-  CHECKBOX "Włąc&z silną ochronę",
+  CHECKBOX "Włąc&z silną ochronę",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+  CHECKBOX "Usuń &klucz prywatny, jeżeli eksport został zakończony pomyślnie",
-  CHECKBOX "Usuń &klucz prywatny, jeżeli eksport został zakończony pomyślnie",
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
-CAPTION "Kreator eksportu certyfikatów"
+CAPTION "Kreator eksportu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nazwa pliku:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Przeglądaj...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "Przeglądaj", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
 IDD_EXPORT_FINISH DIALOG 0,0,317,178
-CAPTION "Kreator eksportu certyfikatów"
+CAPTION "Kreator eksportu certyfikatów"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Kończenie pracy kreatora eksportu certyfikatów", IDC_EXPORT_TITLE,
+  LTEXT "Kończenie pracy kreatora eksportu certyfikatów", IDC_EXPORT_TITLE,
     115,1,195,40
-  LTEXT "Praca kreatora eksportu certyfikatów została zakończona pomyślnie.",
+  LTEXT "Praca kreatora eksportu certyfikatów została zakończona pomyślnie.",
     -1, 115,33,195,24
-  LTEXT "Określiłeś następujące ustawienia:",
+  LTEXT "Określiłeś następujące ustawienia:",
     -1, 115,57,195,12
   CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,

reactos/dll/win32/cryptui/cryptui_Pt.rc

@@ -1,8 +1,7 @@
 /*
- * cryptui dll Portuguese resources
+ * cryptui dll resources
  *
- * Copyright 2009 Ricardo Filipe
+ * Copyright 2008 Juan Lang
- * Copyright 2010 Gustavo Henrique Milaré
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,162 +20,7 @@
 
 #include "cryptuires.h"
 
-#pragma code_page(65001)
+LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-STRINGTABLE
-{
-    IDS_CERTIFICATE "Certificado"
-    IDS_CERTIFICATEINFORMATION "Informação do Certificado"
-    IDS_CERT_INFO_BAD_SIG "Este certificado tem uma assinatura inválida. O certificado pode ter sido alterado ou corrompido."
-    IDS_CERT_INFO_UNTRUSTED_CA "Este certificado raíz não é confiável. Para ficar confiável, adicione-o ao conjunto de certificados raíz confiáveis do seu sistema."
-    IDS_CERT_INFO_UNTRUSTED_ROOT "Este certificado não foi validado num certificado raíz confiável."
-    IDS_CERT_INFO_PARTIAL_CHAIN "O emissor deste certificado não foi encontrado."
-    IDS_CERT_INFO_BAD_PURPOSES "Todos os propósitos deste certificado não foram verificados."
-    IDS_CERT_INFO_PURPOSES "Este certificado é intencionado com os seguintes propósitos::"
-    IDS_SUBJECT_HEADING "Emitido a: "
-    IDS_ISSUER_HEADING "Emitido por: "
-    IDS_VALID_FROM "Válido de "
-    IDS_VALID_TO " para "
-    IDS_CERTIFICATE_BAD_SIGNATURE "Este certificado tem uma assinatura inválida."
-    IDS_CERTIFICATE_BAD_TIME "Este certificado expirou ou ainda não é válido."
-    IDS_CERTIFICATE_BAD_TIMENEST "O período de validade deste certificado excede o do seu emissor."
-    IDS_CERTIFICATE_REVOKED "Este certificado foi revogado pelo seu emissor."
-    IDS_CERTIFICATE_VALID "Este certificado está OK."
-    IDS_FIELD "Campo"
-    IDS_VALUE "Valor"
-    IDS_FIELDS_ALL "<Todos>"
-    IDS_FIELDS_V1 "Campos da Versão 1 Apenas"
-    IDS_FIELDS_EXTENSIONS "Extensões Apenas"
-    IDS_FIELDS_CRITICAL_EXTENSIONS "Extensões Críticas Apenas"
-    IDS_FIELDS_PROPERTIES "Propriedades Apenas"
-    IDS_FIELD_VERSION "Versão"
-    IDS_FIELD_SERIAL_NUMBER "Número de Série"
-    IDS_FIELD_ISSUER "Emissor"
-    IDS_FIELD_VALID_FROM "Válido desde"
-    IDS_FIELD_VALID_TO "Válido até"
-    IDS_FIELD_SUBJECT "Sujeito"
-    IDS_FIELD_PUBLIC_KEY "Chave Pública"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
-    IDS_PROP_HASH "SHA1 hash"
-    IDS_PROP_ENHKEY_USAGE "Uso de chave avançado (propriedade)"
-    IDS_PROP_FRIENDLY_NAME "Nome amigável"
-    IDS_PROP_DESCRIPTION "Descrição"
-    IDS_CERTIFICATE_PROPERTIES "Propriedades do Certificado"
-    IDS_CERTIFICATE_PURPOSE_ERROR "Por favor insira um OID na forma 1.2.3.4"
-    IDS_CERTIFICATE_PURPOSE_EXISTS "O OID inserido já existe."
-    IDS_SELECT_STORE_TITLE "Selecione o Conjunto de Certificados"
-    IDS_SELECT_STORE "Por favor selecione um conjunto de certificados."
-    IDS_IMPORT_WIZARD "Assistente de Importação de Certificados"
-    IDS_IMPORT_TYPE_MISMATCH "O arquivo contém objetos que não correspondem ao critério dado. Por favor selecione outro arquivo."
-    IDS_IMPORT_FILE_TITLE "Arquivo a Importar"
-    IDS_IMPORT_FILE_SUBTITLE "Especifique o arquivo que deseja importar."
-    IDS_IMPORT_STORE_TITLE "Conjunto de Certificados"
-    IDS_IMPORT_STORE_SUBTITLE "Os Conjuntos de Certificados são colecões de certificados, listas de revogação de certificados e listas de certificados confiáveis."
-    IDS_IMPORT_FILTER_CERT "Certificado X.509 (*.cer; *.crt)"
-    IDS_IMPORT_FILTER_PFX "Troca de Informações Pessoais (*.pfx; *.p12)"
-    IDS_IMPORT_FILTER_CRL "Lista de Revogação de Certificados (*.crl)"
-    IDS_IMPORT_FILTER_CTL "Lista de Certificados Confiáveis (*.stl)"
-    IDS_IMPORT_FILTER_SERIALIZED_STORE "Conjunto de Certificados Serializados da Microsoft (*.sst)"
-    IDS_IMPORT_FILTER_CMS "Mensagens CMS/PKCS #7 (*.spc; *.p7b)"
-    IDS_IMPORT_FILTER_ALL "Todos os Arquivos (*.*)"
-    IDS_IMPORT_EMPTY_FILE "Por favor selecione um arquivo."
-    IDS_IMPORT_BAD_FORMAT "O formato do arquivo não é reconhecido. Por favor selecione outro arquivo."
-    IDS_IMPORT_OPEN_FAILED "Não foi possível abrir "
-    IDS_IMPORT_DEST_DETERMINED "Determinado pelo programa"
-    IDS_IMPORT_SELECT_STORE "Por favor selecione um conjunto"
-    IDS_IMPORT_STORE_SELECTION "Conjunto de Certificados Selecionado"
-    IDS_IMPORT_DEST_AUTOMATIC "Determinado automaticamente pelo programa"
-    IDS_IMPORT_FILE "Arquivo"
-    IDS_IMPORT_CONTENT "Conteúdo"
-    IDS_IMPORT_CONTENT_CERT "Certificado"
-    IDS_IMPORT_CONTENT_CRL "Lista de Revogação de Certificados"
-    IDS_IMPORT_CONTENT_CTL "Lista de Certificados Confiáveis"
-    IDS_IMPORT_CONTENT_CMS "Mensagem CMS/PKCS #7"
-    IDS_IMPORT_CONTENT_PFX "Troca de Informações Pessoais"
-    IDS_IMPORT_CONTENT_STORE "Conjunto de Certificados"
-    IDS_IMPORT_SUCCEEDED "A importação foi bem sucedida."
-    IDS_IMPORT_FAILED "A importação falhou."
-    IDS_WIZARD_TITLE_FONT "Arial"
-    IDS_PURPOSE_ALL "<Todos>"
-    IDS_PURPOSE_ADVANCED "<Propósitos Avançados>"
-    IDS_SUBJECT_COLUMN "Emitido para"
-    IDS_ISSUER_COLUMN "Emitido por"
-    IDS_EXPIRATION_COLUMN "Data de Validade"
-    IDS_FRIENDLY_NAME_COLUMN "Nome Amigável"
-    IDS_ALLOWED_PURPOSE_ALL "<Todos>"
-    IDS_ALLOWED_PURPOSE_NONE "<Nenhum>"
-    IDS_WARN_REMOVE_MY "Não será mais possível continuar a decifrar ou assinar mensagens com este certificado.\nTem certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_PLURAL_MY "Não será mais possível continuar a decifrar ou assinar mensagens com estes certificados.\nTem certeza que deseja remover estes certificados?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Não será mais possível continuar a cifrar ou verificar mensagens com este certificado.\nTem certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Não será mais possível continuar a cifrar ou verificar mensagens com estes certificados.\nTem certeza que deseja remover estes certificados?"
-    IDS_WARN_REMOVE_CA "Os certificados emitidos por esta autoridade de certificação não serão considerados confiáveis de agora em diante.\nTem certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_PLURAL_CA "Os certificados emitidos por estas autoridades de certificação não serão considerados confiáveis de agora em diante.\nTem certeza que deseja remover estes certificados?"
-    IDS_WARN_REMOVE_ROOT "Os certificados emitidos por esta autoridade de certificação raíz ou quaisquer autoridades de certificação por ela emitidas não serão consideradas confiáveis de agora em diante.\nTem certeza que deseja remover este certificado raíz confiável?"
-    IDS_WARN_REMOVE_PLURAL_ROOT "Os certificados emitidos por estas autoridades de certificação raíz ou quaisquer autoridades de certificação por elas emitidas não serão consideradas confiáveis de agora em diante.\nTem certeza que deseja remover estes certificados raíz confiáveis?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Os softwares assinados por este editor não continuarão a ser considerado confiáveis.\nTem certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Os softwares assinado por estes editores não continuarão a ser considerados confiáveis.\nTem certeza que deseja remover estes certificados?"
-    IDS_WARN_REMOVE_DEFAULT "Tem certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_PLURAL_DEFAULT "Tem certeza que deseja remover estes certificados?"
-    IDS_CERT_MGR "Certificados"
-    IDS_FRIENDLY_NAME_NONE "<Nenhum>"
-    IDS_PURPOSE_SERVER_AUTH "Assegura a identidade de um computador remoto"
-    IDS_PURPOSE_CLIENT_AUTH "Prova a sua identidade a um computador remoto"
-    IDS_PURPOSE_CODE_SIGNING "Assegura que o software veio de uma editora de software\nProtege o software de alterações após a publicação"
-    IDS_PURPOSE_EMAIL_PROTECTION "Protege mensagens de e-mail"
-    IDS_PURPOSE_IPSEC "Permite comunicação segura pela Internet"
-    IDS_PURPOSE_TIMESTAMP_SIGNING "Permite que os dados sejam assinados com o tempo atual"
-    IDS_PURPOSE_CTL_USAGE_SIGNING "Permite assinar digitalmente uma lista de certificados confiáveis"
-    IDS_PURPOSE_EFS "Permite que os dados em disco sejam encriptados"
-    IDS_PURPOSE_EFS_RECOVERY "Recuperação de Arquivos"
-    IDS_PURPOSE_WHQL "Verificação de Driver de Hardware do Windows"
-    IDS_PURPOSE_NT5 "Verificação de Componente de Sistema do Windows"
-    IDS_PURPOSE_OEM_WHQL "Verificação de Componente de Sistema do Windows OEM"
-    IDS_PURPOSE_EMBEDDED_NT "Verificação de Componente de Sistema do Windows Embebido"
-    IDS_PURPOSE_ROOT_LIST_SIGNER "Assinador de Lista Raiz"
-    IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordinação Qualificada"
-    IDS_PURPOSE_KEY_RECOVERY "Recuperação de Chaves"
-    IDS_PURPOSE_DOCUMENT_SIGNING "Assinatura de Documento"
-    IDS_PURPOSE_LIFETIME_SIGNING "Assinatura de Lifetime"
-    IDS_PURPOSE_DRM "Direito Digital"
-    IDS_PURPOSE_LICENSES "Key Pack Licenses"
-    IDS_PURPOSE_LICENSE_SERVER "License Server Verification"
-    IDS_PURPOSE_ENROLLMENT_AGENT "Agente de Requerimento de Certificado"
-    IDS_PURPOSE_SMARTCARD_LOGON "Logon de Smart Card"
-    IDS_PURPOSE_CA_EXCHANGE "Arquivação de Chave Privada"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "Agente de Recuperação de Chave"
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication"
-    IDS_EXPORT_WIZARD "Assistente de Exportação de Certificados"
-    IDS_EXPORT_FORMAT_TITLE "Formato de Exportação"
-    IDS_EXPORT_FORMAT_SUBTITLE "Escolha o formato em que o conteúdo será salvo."
-    IDS_EXPORT_FILE_TITLE "Exportar Arquivo"
-    IDS_EXPORT_FILE_SUBTITLE "Especifique o nome do arquivo em que o conteúdo será salvo."
-    IDS_EXPORT_FILE_EXISTS "O arquivo especificado já existe. Deseja substituí-lo?"
-    IDS_EXPORT_FILTER_CERT "Binário DER-Codificado X.509 (*.cer)"
-    IDS_EXPORT_FILTER_BASE64_CERT "Base64-Codificado X.509 (*.cer)"
-    IDS_EXPORT_FILTER_CRL "Lista de Revogação de Certificados (*.crl)"
-    IDS_EXPORT_FILTER_CTL "Lista de Certificados Confiáveis (*.stl)"
-    IDS_EXPORT_FILTER_CMS "Mensagens CMS/PKCS #7 (*.p7b)"
-    IDS_EXPORT_FILTER_PFX "Troca de Informações Pessoais (*.pfx)"
-    IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Conjunto de Certificados Serializados (*.sst)"
-    IDS_EXPORT_FORMAT "Formato do Arquivo"
-    IDS_EXPORT_INCLUDE_CHAIN "Incluir todos os certificados no caminho do certificado"
-    IDS_EXPORT_KEYS "Exportar Chaves"
-    IDS_YES "Sim"
-    IDS_NO "Não"
-    IDS_EXPORT_SUCCEEDED "A exportação foi bem sucedida."
-    IDS_EXPORT_FAILED "A exportação falhou."
-    IDS_EXPORT_PRIVATE_KEY_TITLE "Exportar Chave Privada"
-    IDS_EXPORT_PRIVATE_KEY_SUBTITLE "O certificado contém uma chave privada que pode ser exportada em conjunto com o certificado."
-    IDS_EXPORT_PASSWORD_TITLE "Digite Palavra Chave"
-    IDS_EXPORT_PASSWORD_SUBTITLE "Você pode proteger uma chave privada com uma palavra chave."
-    IDS_EXPORT_PASSWORD_MISMATCH "As palavras chave não coincidem."
-    IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Nota: A chave privada para este certificado não pôde ser aberta."
-    IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Nota: A chave privada para este certificado não é exportável."
-}
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE
 {
@@ -233,7 +77,10 @@ STRINGTABLE
     IDS_IMPORT_FILTER_CTL "Lista de Certificados Confiáveis (*.stl)"
     IDS_IMPORT_FILTER_SERIALIZED_STORE "Conjunto de Certificados Serializados da Microsoft (*.sst)"
     IDS_IMPORT_FILTER_CMS "Mensagens CMS/PKCS #7 (*.spc; *.p7b)"
-    IDS_IMPORT_FILTER_ALL "Todos os Ficheiros (*.*)"
+    IDS_IMPORT_FILTER_ALL "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Todos os arquivos (*.*)\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Todos os ficheiros (*.*)"
     IDS_IMPORT_EMPTY_FILE "Por favor seleccione um ficheiro."
     IDS_IMPORT_BAD_FORMAT "O formato do ficheiro não é reconhecido. Por favor seleccione outro ficheiro."
     IDS_IMPORT_OPEN_FAILED "Não consegui abrir "
@@ -260,46 +107,99 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Nome Amigável"
     IDS_ALLOWED_PURPOSE_ALL "<Todos>"
     IDS_ALLOWED_PURPOSE_NONE "<Nenhum>"
-    IDS_WARN_REMOVE_MY "Não vai poder continuar a decifrar ou assinar mensagens com este certificado.\nTem a certeza que deseja remover este certificado?"
+    IDS_WARN_REMOVE_MY "Não vai poder continuar a decifrar ou assinar mensagens com este certificado.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Não vai poder continuar a decifrar ou assinar mensagens com estes certificados.\nTem a certeza que deseja remover estes certificados?"
+Tem a certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Não vai poder continuar a cifrar ou verificar mensagens com este certificado.\nTem a certeza que deseja remover este certificado?"
+    IDS_WARN_REMOVE_PLURAL_MY "Não vai poder continuar a decifrar ou assinar mensagens com estes certificados.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Não vai poder continuar a cifrar ou verificar mensagens com estes certificados.\nTem a certeza que deseja remover estes certificados?"
+Tem a certeza que deseja remover estes certificados?"
-    IDS_WARN_REMOVE_CA "Os certificados emitidos por esta autoridade de certificação não continuarão a ser confiáveis.\nTem a certeza que deseja remover este certificado?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Não vai poder continuar a cifrar ou verificar mensagens com este certificado.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Os certificados emitidos por estas autoridades de certificação não continuarão a ser confiáveis.\nTem a certeza que deseja remover estes certificados?"
+Tem a certeza que deseja remover este certificado?"
-    IDS_WARN_REMOVE_ROOT "Os certificados emitidos por esta autoridade de certificação raíz ou quaisquer autoridades de certificação por ela emitidas não continuarão a ser confiáveis.\nTem a certeza que deseja remover este certificado raíz confiável?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Não vai poder continuar a cifrar ou verificar mensagens com estes certificados.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Os certificados emitidos por estas autoridades de certificação raíz ou quaisquer autoridades de certificação por elas emitidas não continuarão a ser confiáveis.\nTem a certeza que deseja remover estes certificados raíz confiáveis?"
+Tem a certeza que deseja remover estes certificados?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software assinado por este editor não continuará a ser confiável.\nTem a certeza que deseja remover este certificado?"
+    IDS_WARN_REMOVE_CA "Os certificados emitidos por esta autoridade de certificação não continuarão a ser confiáveis.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software assinado por estes editores não continuará a ser confiável.\nTem a certeza que deseja remover estes certificados?"
+Tem a certeza que deseja remover este certificado?"
+    IDS_WARN_REMOVE_PLURAL_CA "Os certificados emitidos por estas autoridades de certificação não continuarão a ser confiáveis.\n\
+Tem a certeza que deseja remover estes certificados?"
+    IDS_WARN_REMOVE_ROOT "Os certificados emitidos por esta autoridade de certificação raíz ou quaisquer autoridades de certificação por ela emitidas não continuarão a ser confiáveis.\n\
+Tem a certeza que deseja remover este certificado raíz confiável?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Os certificados emitidos por estas autoridades de certificação raíz ou quaisquer autoridades de certificação por elas emitidas não continuarão a ser confiáveis.\n\
+Tem a certeza que deseja remover estes certificados raíz confiáveis?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software assinado por este editor não continuará a ser confiável.\n\
+Tem a certeza que deseja remover este certificado?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software assinado por estes editores não continuará a ser confiável.\n\
+Tem a certeza que deseja remover estes certificados?"
     IDS_WARN_REMOVE_DEFAULT "Tem a certeza que deseja remover este certificado?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Tem a certeza que deseja remover estes certificados?"
     IDS_CERT_MGR "Certificados"
     IDS_FRIENDLY_NAME_NONE "<Nenhum>"
     IDS_PURPOSE_SERVER_AUTH "Assegura a identidade de um computador remoto"
     IDS_PURPOSE_CLIENT_AUTH "Prova a sua identidade a um computador remoto"
-    IDS_PURPOSE_CODE_SIGNING "Assegura que o software veio de uma editora de software\nProtege o software de alterações após publicação"
+    IDS_PURPOSE_CODE_SIGNING "Assegura que o software veio de uma editora de software\n\
+Protege o software de alterações após publicação"
     IDS_PURPOSE_EMAIL_PROTECTION "Protege mensagens de e-mail"
     IDS_PURPOSE_IPSEC "Permite comunicação segura pela Internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Permite que os dados sejam assinados com o tempo actual"
     IDS_PURPOSE_CTL_USAGE_SIGNING "Permite que assine digitalmente uma lista de certificados confiáveis"
     IDS_PURPOSE_EFS "Permite que os dados em disco sejam cifrados"
     IDS_PURPOSE_EFS_RECOVERY "Recuperação de Ficheiros"
-    IDS_PURPOSE_WHQL "Windows Hardware Driver Verification"
+    IDS_PURPOSE_WHQL "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_NT5 "Windows System Component Verification"
+Verificação de Driver de Hardware Windows\n\
-    IDS_PURPOSE_OEM_WHQL "OEM Windows System Component Verification"
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_EMBEDDED_NT "Embedded Windows System Component Verification"
+Windows Hardware Driver Verification"
+    IDS_PURPOSE_NT5 "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Verificação de Componentes de Sistema Windows\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Windows System Component Verification"
+    IDS_PURPOSE_OEM_WHQL "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Verificação de Componentes de Sistema OEM Windows\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+OEM Windows System Component Verification"
+    IDS_PURPOSE_EMBEDDED_NT "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Verificação de Componentes de Sistema Windows Embebida\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Embedded Windows System Component Verification"
     IDS_PURPOSE_ROOT_LIST_SIGNER "Root List Signer"
-    IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualified Subordination"
+    IDS_PURPOSE_QUALIFIED_SUBORDINATION "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_KEY_RECOVERY "Key Recovery"
+Subordinação Qualificada\n\
-    IDS_PURPOSE_DOCUMENT_SIGNING "Document Signing"
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_LIFETIME_SIGNING "Lifetime Signing"
+Qualified Subordination"
-    IDS_PURPOSE_DRM "Digital Rights"
+    IDS_PURPOSE_KEY_RECOVERY "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_LICENSES "Key Pack Licenses"
+Recuperação de chaves\n\
-    IDS_PURPOSE_LICENSE_SERVER "License Server Verification"
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_ENROLLMENT_AGENT "Certificate Request Agent"
+Key Recovery"
+    IDS_PURPOSE_DOCUMENT_SIGNING "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Assinatura de Documento\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Document Signing"
+    IDS_PURPOSE_LIFETIME_SIGNING "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Assinatura de tempo de vida\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Lifetime Signing"
+    IDS_PURPOSE_DRM "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Direitos Digitais\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Digital Rights"
+    IDS_PURPOSE_LICENSES "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Licenças de Pacotes de Chaves\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Key Pack Licenses"
+    IDS_PURPOSE_LICENSE_SERVER "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Verificação de Licença de Servidor\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+License Server Verification"
+    IDS_PURPOSE_ENROLLMENT_AGENT "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Agente de Pedido de Certificados\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Certificate Request Agent"
     IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Logon"
     IDS_PURPOSE_CA_EXCHANGE "Private Key Archival"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "Key Recovery Agent"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication"
+Agente Recuperador de Chaves\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Key Recovery Agent"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Replicação do Directório de Serviço Email\n\
+#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n\
+Directory Service Email Replication"
     IDS_EXPORT_WIZARD "Assistente de Exportação de Certificados"
     IDS_EXPORT_FORMAT_TITLE "Formato de Exportação"
     IDS_EXPORT_FORMAT_SUBTITLE "Escolha o formato em que o conteúdo será guardado."
@@ -329,71 +229,36 @@ STRINGTABLE
     IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Nota: A chave privada para este certificado não é exportável."
 }
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
 IDD_GENERAL DIALOG 0, 0, 255, 236
 CAPTION "Geral"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Instalar Certificado...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Instalar Certificado...", IDC_ADDTOSTORE,103,216,70,14
+  PUSHBUTTON "&Declaração do Emissor", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "&Declaração do Emissor", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
 IDD_DETAIL DIALOG 0, 0, 255, 236
 CAPTION "Detalhes"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Mostrar:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Editar Propriedades...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Copiar para Ficheiro...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Editar Propriedades...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Copiar para Arquivo...", IDC_EXPORT,177,216,70,14
 END
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-IDD_DETAIL DIALOG 0, 0, 255, 236
-CAPTION "Detalhes"
-STYLE WS_VISIBLE
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "&Mostrar:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14,
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-  CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    6,28,241,100
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  PUSHBUTTON "&Editar Propriedades...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Copiar para Ficheiro...", IDC_EXPORT,177,216,70,14
-END
-
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
 CAPTION "Caminho de Certificação"
 STYLE WS_VISIBLE
@@ -402,15 +267,12 @@ BEGIN
   GROUPBOX "&Caminho de Certificação", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Ver Certificado", IDC_VIEWCERTIFICATE,175,156,70,14
+  PUSHBUTTON "&Ver Certificado", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "&Estado do Certificado:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "&Estado do Certificado:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
 IDD_USERNOTICE DIALOG 0, 0, 255, 256
 CAPTION "Declaração"
 STYLE WS_VISIBLE
@@ -418,76 +280,32 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "&Fechar", IDOK,103,216,70,14
+  PUSHBUTTON "Fechar", IDOK,73,216,85,14
-  PUSHBUTTON "&Mais Informação", IDC_CPS,177,216,70,14
+  PUSHBUTTON "&Mais Informação", IDC_CPS,162,216,85,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
 CAPTION "Geral"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nome amigável:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Descrição:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Propósitos do Certificado", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Propósitos do Certificado", -1,6,48,245,185, BS_GROUPBOX
-  AUTORADIOBUTTON "&Ativar todos os propósitos para este certificado",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "D&esativar todos os propósitos para este certificado",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "A&tivar apenas os seguintes propósitos para este certificado:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
-  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
-    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
-  PUSHBUTTON "Adicionar &Propósito...", IDC_ADD_PURPOSE,184,194,60,14
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
-CAPTION "Geral"
-STYLE WS_VISIBLE
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "&Nome amigável:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Descrição:"
-, -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Propósitos do Certificado", -1,6,48,245,165, BS_GROUPBOX
   AUTORADIOBUTTON "&Activar todos os propósitos para este certificado",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "D&esactivar todos os propósitos para este certificado",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "A&ctivar apenas os seguintes propósitos para este certificado:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Adicionar &Propósito...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Adicionar &Propósito...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
-CAPTION "Adicionar Propósito"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Adicione o identificador de objeto (OID) para o propósito que deseja adicionar:",
-    -1, 6,6,190,28
-  EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  PUSHBUTTON "OK", IDOK, 33,48,60,14
-  PUSHBUTTON "Cancelar", IDCANCEL, 100,48,60,14
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
 CAPTION "Adicionar Propósito"
 FONT 8, "MS Shell Dlg"
@@ -499,162 +317,58 @@ BEGIN
   PUSHBUTTON "Cancelar", IDCANCEL, 100,48,60,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
 IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "Selecione Conjunto de Certificados"
+CAPTION "Seleccione o Conjunto de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Selecione o conjunto de certificados que deseja usar:", IDC_STORE_TEXT, 6,6,190,28
-  CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
-    6,28,188,70
-  CHECKBOX "&Mostrar conjuntos físicos", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
-    BS_AUTOCHECKBOX|WS_TABSTOP
-  PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
-  PUSHBUTTON "Cancelar", IDCANCEL, 144,118,50,14
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "Seleccione Conjunto de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Seleccione o conjunto de certificados que deseja usar:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Mostrar conjuntos físicos", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,
+  CHECKBOX "&Mostrar conjuntos físicos", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Cancelar", IDCANCEL, 144,118,50,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
 IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Assistente de Importação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Bem-vindo ao Assistente de Importação de Certificados", IDC_IMPORT_TITLE,
+  LTEXT "Benvindo ao Assistente de Importação de Certificados", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Este assistente vai ajudá-lo a importar certificados, listas de revogação de certificados e listas de certificados confiáveis a partir de um arquivo para um conjunto de certificados.",
-    -1, 115,26,195,25
-  LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador usado na comunicação. Também pode ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são coleções de certificados, listas de revogação de certificados e listas de certificados confiáveis.",
-    -1, 115,56,195,40
-  LTEXT "Para continuar clique em Próximo.",
-    -1, 115,103,195,8
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-IDD_IMPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "Assistente de Importação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Benvindo ao Assistente de Importação de Certificados", IDC_IMPORT_TITLE,
-    115,7,195,12
-  LTEXT "Este assistente vai ajudá-lo a importar certificados, listas de revogação de certificados e listas de certificados confiáveis a partir de um ficheiro para um conjunto de certificados.",
-    -1, 115,26,195,25
   LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador do qual está a comunicar. Também pode ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são colecções de certificados, listas de revogação de certificados e listas de certificados confiáveis.",
-    -1, 115,56,195,40
+    -1, 115,40,195,120
-  LTEXT "Para continuar clique em Seguinte.",
-    -1, 115,103,195,8
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_IMPORT_FILE DIALOG 0,0,317,178
-CAPTION "Assistente de Importação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "&Nome do arquivo:", -1, 21,1,195,10
-  EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Procurar...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
-  LTEXT "Nota: os seguintes formatos de arquivo podem conter mais que um certificado, lista de revogação de certificados ou lista de certificados confiáveis:",
-    -1, 21,26,265,16
-  LTEXT "Padrão de Sintaxe de Mensagem Criptográfica/Mensagens PKCS #7 (.p7b)",
-    -1, 31,49,265,10
-  LTEXT "Troca de Informações Pessoais/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
-  LTEXT "Conjunto de Certificados Serializados da Microsoft (.sst)",
-    -1, 31,79,265,10
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_IMPORT_FILE DIALOG 0,0,317,178
 CAPTION "Assistente de Importação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nome do ficheiro:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Procurar...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "P&rocurar", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Nota: os seguintes formatos de ficheiro podem conter mais que um certificado, lista de revogação de certificados ou lista de certificados confiáveis:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Troca de Informações Pessoais/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Conjunto de Certificados Serializados da Microsoft (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_IMPORT_STORE DIALOG 0,0,317,143
-CAPTION "Assistente de Importação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "O Wine pode automaticamente selecionar o conjunto de certificados ou você pode especificar a localização para os certificados.",
-    -1, 21,1,195,20
-  AUTORADIOBUTTON "&Selecionar conjunto de certificados automaticamente",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "&Colocar todos os certificados no seguinte conjunto:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
-  PUSHBUTTON "&Procurar...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_IMPORT_STORE DIALOG 0,0,317,143
 CAPTION "Assistente de Importação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "O Wine pode automaticamente seleccionar o conjunto de certificados ou você pode especificar a localização para os certificados.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "&Seleccionar conjunto de certificados automaticamente",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Colocar todos os certificados no seguinte conjunto:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Procurar...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "P&rocurar", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_IMPORT_FINISH DIALOG 0,0,317,178
-CAPTION "Assistente de Importação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Finalizando o Assistente de Importação de Certificados", IDC_IMPORT_TITLE,
-    115,1,195,40
-  LTEXT "O Assistente de Importação de Certificados finalizou com sucesso.",
-    -1, 115,33,195,24
-  LTEXT "Foram especificadas as seguintes configurações:",
-    -1, 115,57,195,12
-  CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32",
-    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    115,67,174,100
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Assistente de Importação de Certificados"
 FONT 8, "MS Shell Dlg"
@@ -670,50 +384,24 @@ BEGIN
     115,67,174,100
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
 IDD_CERT_MGR DIALOG 0,0,335,270
 CAPTION "Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Com o propósito:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importar...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "E&xportar...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Remover", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importar...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Avançadas...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Exportar...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Remover", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Avançadas...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Propósitos do Certificado", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Ver...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Ver", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "&Fechar", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
-CAPTION "Opções Avançadas"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  GROUPBOX "Propósito do certificado", -1, 7,7,234,141, BS_GROUPBOX
-  LTEXT "Selecione um ou mais propósitos a serem listados quando Propósitos Avançados estiver selecionado.",
-    -1, 14,18,220,16
-  LTEXT "&Propósitos de Certificados:", -1, 14,41,90,12, WS_TABSTOP
-  CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
-    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    14,51,220,90
-  PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON
-  PUSHBUTTON "Cancelar", IDCANCEL, 190,155,51,14
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
 CAPTION "Opções Avançadas"
 FONT 8, "MS Shell Dlg"
@@ -729,57 +417,15 @@ BEGIN
   PUSHBUTTON "Cancelar", IDCANCEL, 190,155,51,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
 IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Assistente de Exportação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Bem-vindo ao Assistente de Exportação de Certificados", IDC_EXPORT_TITLE,
+  LTEXT "Benvindo ao Assistente de Exportação de Certificados", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
+  LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador do qual está a comunicar. Também pode ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são colecções de certificados, listas de revogação de certificados e listas de certificados confiáveis.",
-  LTEXT "Este assistente vai ajudá-lo a exportar certificados, listas de revogação de certificados e listas de certificados confiáveis a partir de um conjunto de certificados para um arquivo.",
+    -1, 115,40,195,120
-    -1, 115,26,195,25
-  LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador usado na comunicação. Pode também ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são coleções de certificados, listas de revogação de certificados e listas de certificados confiáveis.",
-    -1, 115,56,195,40
-  LTEXT "Para continuar clique em Próximo.",
-    -1, 115,103,195,8
 END
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-IDD_EXPORT_WELCOME DIALOG 0,0,317,143
-CAPTION "Assistente de Exportação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Benvindo ao Assistente de Exportação de Certificados", IDC_EXPORT_TITLE,
-    115,7,195,12
-  LTEXT "Este assistente vai ajudá-lo a exportar certificados, listas de revogação de certificados e listas de certificados confiáveis a partir de um conjunto de certificados para um ficheiro.",
-    -1, 115,26,195,25
-  LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador de onde está a comunicar. Pode também ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são colecções de certificados, listas de revogação de certificados e listas de certificados confiáveis.",
-    -1, 115,56,195,40
-  LTEXT "Para continuar clique em Seguinte.",
-    -1, 115,103,195,8
-END
-
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
-CAPTION "Assistente de Exportação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Ao escolher exportar a chave privada será pedida uma palavra chave para proteger a chave privada mais à frente.", -1, 21,1,195,25
-  LTEXT "Deseja exportar a chave privada?", -1, 21,27,195,10
-  AUTORADIOBUTTON "&Sim, exportar a chave privada",
-    IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "&Não, não exportar a chave privada",
-    IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON
-  LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
 CAPTION "Assistente de Exportação de Certificados"
 FONT 8, "MS Shell Dlg"
@@ -793,129 +439,48 @@ BEGIN
   LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
 IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
 CAPTION "Assistente de Exportação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Palavra chave:", -1, 21,1,195,10
+  LTEXT "&Password:", -1, 21,1,195,10
-  EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  LTEXT "&Confirmar palavra chave:", -1, 21,35,195,10
-  EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
-CAPTION "Assistente de Exportação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "&Palavra-passe:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Confirmar palavra-passe:", -1, 21,35,195,10
   EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_EXPORT_FORMAT DIALOG 0,0,317,143
-CAPTION "Assistente de Exportação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Selecione o formato que deseja utilizar:", -1, 21,1,195,10
-  AUTORADIOBUTTON "&DER-codificado X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
-  AUTORADIOBUTTON "Ba&se64-codificado X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "Padrão de Sintaxe de Mensagem &Criptográfica/PKCS #7 Message (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
-  CHECKBOX "&Incluir todos os certificados no caminho do certificado se possível",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-  AUTORADIOBUTTON "Troca de Informações &Pessoais/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
-  CHECKBOX "Incl&uir todos os certificados no caminho de certificação se possível",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-  CHECKBOX "&Ativar criptografia forte",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-  CHECKBOX "&Apagar a chave privada se a exportação for bem sucedida",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_EXPORT_FORMAT DIALOG 0,0,317,143
 CAPTION "Assistente de Exportação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Seleccione o formato que deseja utilizar:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-encoded X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Incluir todos os certificados no caminho de certificação se possível",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "Troca de Informações &Pessoais/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Incl&uir todos os certificados no caminho de certificação se possível",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Activar cifra forte",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Apagar a chave privada se a exportação for bem sucedida",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_EXPORT_FILE DIALOG 0,0,317,143
-CAPTION "Assistente de Exportação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "&Nome do arquivo:", -1, 21,1,195,10
-  EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Procurar...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_EXPORT_FILE DIALOG 0,0,317,143
 CAPTION "Assistente de Exportação de Certificados"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nome do ficheiro:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "&Procurar...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "P&rocurar", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-IDD_EXPORT_FINISH DIALOG 0,0,317,178
-CAPTION "Assistente de Exportação de Certificados"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Finalizando o Assistente de Exportação de Certificados", IDC_EXPORT_TITLE,
-    115,1,195,40
-  LTEXT "O Assistente de Exportação de Certificados finalizou com sucesso.",
-    -1, 115,33,195,24
-  LTEXT "Foram especificadas as seguintes configurações:",
-    -1, 115,57,195,12
-  CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32",
-    LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    115,67,174,100
-END
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 IDD_EXPORT_FINISH DIALOG 0,0,317,178
 CAPTION "Assistente de Exportação de Certificados"
 FONT 8, "MS Shell Dlg"

reactos/dll/win32/cryptui/cryptui_Ro.rc

@@ -2,8 +2,6 @@
  * cryptui dll resources
  *
  * Copyright 2008 Juan Lang
- * Copyright 2010 Claudia Cotună
- *                Michael Stefaniuc
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,9 +20,7 @@
 
 #include "cryptuires.h"
 
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
-
-#pragma code_page(65001)
 
 STRINGTABLE
 {
@@ -93,7 +89,10 @@ STRINGTABLE
     IDS_IMPORT_CONTENT "Conținut"
     IDS_IMPORT_CONTENT_CERT "Certificat"
     IDS_IMPORT_CONTENT_CRL "Lista certificatelor revocate"
-    IDS_IMPORT_CONTENT_CTL "Lista certificatelor acreditate"
+    IDS_IMPORT_CONTENT_CTL "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Lista certificatelor de încredere\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Lista certificatelor acreditate"
     IDS_IMPORT_CONTENT_CMS "Mesaj CMS/PKCS #7"
     IDS_IMPORT_CONTENT_PFX "Schimb de informații personale"
     IDS_IMPORT_CONTENT_STORE "Depozit de certificate"
@@ -108,46 +107,99 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Nume uzual"
     IDS_ALLOWED_PURPOSE_ALL "<Toate>"
     IDS_ALLOWED_PURPOSE_NONE "<Niciunul>"
-    IDS_WARN_REMOVE_MY "Nu veți mai putea decripta sau semna mesaje cu acest certificat.\nSigur doriți să eliminați acest certificat?"
+    IDS_WARN_REMOVE_MY "Nu veți mai putea decripta sau semna mesaje cu acest certificat.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Nu veți mai putea decripta sau semna mesaje cu aceste certificate.\nSigur doriți să eliminați aceste certificate?"
+Sigur doriți să eliminați acest certificat?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Nu veți mai putea cripta sau verifica mesaje semnate cu acest certificat.\nSigur doriți să eliminați acest certificat?"
+    IDS_WARN_REMOVE_PLURAL_MY "Nu veți mai putea decripta sau semna mesaje cu aceste certificate.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Nu veți mai putea cripta sau verifica mesaje semnate cu aceste certificate.\nSigur doriți să eliminați aceste certificate?"
+Sigur doriți să eliminați aceste certificate?"
-    IDS_WARN_REMOVE_CA "Certificatele emise de către această autoritate de certificare nu vor mai fi acreditate.\nSigur doriți să eliminați acest certificat?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Nu veți mai putea cripta sau verifica mesaje semnate cu acest certificat.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Certificatele emise de către aceste autorități de certificare nu vor mai fi acreditate.\nSigur doriți să eliminați aceste certificate?"
+Sigur doriți să eliminați acest certificat?"
-    IDS_WARN_REMOVE_ROOT "Certificatele emise de către această autoritate de certificare rădăcină, sau de către orice alte autorități de certificare validate de ea, nu vor mai fi acreditate.\nSigur doriți să eliminați acest certificat rădăcină acreditat?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Nu veți mai putea cripta sau verifica mesaje semnate cu aceste certificate.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Certificatele emise de către aceste autorități de certificare rădăcină, sau de către orice alte autorități de certificare validate de ele, nu vor mai fi acreditate.\nSigur doriți să eliminați aceste certificate rădăcină acreditate?"
+Sigur doriți să eliminați aceste certificate?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Aplicațiile software semnate de către acest editor nu vor mai fi acreditate.\nSigur doriți să eliminați acest certificat?"
+    IDS_WARN_REMOVE_CA "Certificatele emise de către această autoritate de certificare nu vor mai fi acreditate.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Aplicațiile software semnate de către acești editori nu vor mai fi acreditate.\nSigur doriți să eliminați aceste certificate?"
+Sigur doriți să eliminați acest certificat?"
+    IDS_WARN_REMOVE_PLURAL_CA "Certificatele emise de către aceste autorități de certificare nu vor mai fi acreditate.\n\
+Sigur doriți să eliminați aceste certificate?"
+    IDS_WARN_REMOVE_ROOT "Certificatele emise de către această autoritate de certificare rădăcină, sau de către orice alte autorități de certificare validate de ea, nu vor mai fi acreditate.\n\
+Sigur doriți să eliminați acest certificat rădăcină acreditat?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Certificatele emise de către aceste autorități de certificare rădăcină, sau de către orice alte autorități de certificare validate de ele, nu vor mai fi acreditate.\n\
+Sigur doriți să eliminați aceste certificate rădăcină acreditate?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Aplicațiile software semnate de către acest editor nu vor mai fi acreditate.\n\
+Sigur doriți să eliminați acest certificat?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Aplicațiile software semnate de către acești editori nu vor mai fi acreditate.\n\
+Sigur doriți să eliminați aceste certificate?"
     IDS_WARN_REMOVE_DEFAULT "Sigur doriți să eliminați acest certificat?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Sigur doriți să eliminați aceste certificate?"
     IDS_CERT_MGR "Certificate"
     IDS_FRIENDLY_NAME_NONE "<Niciunul>"
     IDS_PURPOSE_SERVER_AUTH "Asigură identificarea unui calculator de la distanță"
     IDS_PURPOSE_CLIENT_AUTH "Vă dovedește identitatea pentru un calculator de la distanță"
-    IDS_PURPOSE_CODE_SIGNING "Garantează că aplicația provine de la un anumit editor de software\nProtejează aplicația de alterări după publicare"
+    IDS_PURPOSE_CODE_SIGNING "Garantează că aplicația provine de la un anumit editor de software\n\
+Protejează aplicația de alterări după publicare"
     IDS_PURPOSE_EMAIL_PROTECTION "Protejează mesajele de email"
     IDS_PURPOSE_IPSEC "Permite comunicarea securizată pe Internet"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Permite semnarea datelor cu ora curentă"
     IDS_PURPOSE_CTL_USAGE_SIGNING "Vă permite să semnați digital o listă de certificate acreditate"
     IDS_PURPOSE_EFS "Permite criptarea datelor de pe disc"
-    IDS_PURPOSE_EFS_RECOVERY "Recupererea fișierelor"
+    IDS_PURPOSE_EFS_RECOVERY "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_WHQL "Verificarea driverelor de hardware din Windows"
+Recuperare de fișiere\n\
-    IDS_PURPOSE_NT5 "Verificarea componentelor de sistem din Windows"
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_OEM_WHQL "Verificarea componentelor de sistem din Windows OEM"
+Recupererea fișierelor"
-    IDS_PURPOSE_EMBEDDED_NT "Verificarea componentelor de sistem din Windows Embedded"
+    IDS_PURPOSE_WHQL "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea driverelor hardware Windows\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea driverelor de hardware din Windows"
+    IDS_PURPOSE_NT5 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea componentelor sistem Windows\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea componentelor de sistem din Windows"
+    IDS_PURPOSE_OEM_WHQL "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea componentelor sistem Windows OEM\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea componentelor de sistem din Windows OEM"
+    IDS_PURPOSE_EMBEDDED_NT "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea componentelor sistem Windows Embedded\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea componentelor de sistem din Windows Embedded"
     IDS_PURPOSE_ROOT_LIST_SIGNER "Semnatarul listei rădăcină"
     IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordonare calificată"
-    IDS_PURPOSE_KEY_RECOVERY "Recuperarea cheilor"
+    IDS_PURPOSE_KEY_RECOVERY "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_DOCUMENT_SIGNING "Semnarea documentelor"
+Recuperare de chei\n\
-    IDS_PURPOSE_LIFETIME_SIGNING "Semnătură pe viață"
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Recuperarea cheilor"
+    IDS_PURPOSE_DOCUMENT_SIGNING "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Semnare de documente\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Semnarea documentelor"
+    IDS_PURPOSE_LIFETIME_SIGNING "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Semnare pe toată durata vieții\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Semnătură pe viață"
     IDS_PURPOSE_DRM "Drepturi digitale"
-    IDS_PURPOSE_LICENSES "Licențe de pachete de chei"
+    IDS_PURPOSE_LICENSES "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_LICENSE_SERVER "Verificare a serverului de licențe"
+Licențiere pachet de chei\n\
-    IDS_PURPOSE_ENROLLMENT_AGENT "Agent solicitare certificat"
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_SMARTCARD_LOGON "Autentificare prin Smart Card"
+Licențe de pachete de chei"
+    IDS_PURPOSE_LICENSE_SERVER "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificarea serverului de licență\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Verificare a serverului de licențe"
+    IDS_PURPOSE_ENROLLMENT_AGENT "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Agent de cerere de certificate\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Agent solicitare certificat"
+    IDS_PURPOSE_SMARTCARD_LOGON "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Log on cu Smart Card\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Autentificare prin Smart Card"
     IDS_PURPOSE_CA_EXCHANGE "Arhivare chei private"
-    IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent recuperare chei"
+    IDS_PURPOSE_KEY_RECOVERY_AGENT "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
-    IDS_PURPOSE_DS_EMAIL_REPLICATION "Serviciu Registru pentru replicare email"
+Agent de recuperare a cheilor\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Agent recuperare chei"
+    IDS_PURPOSE_DS_EMAIL_REPLICATION "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Replicarea serviciilor repertoar de e-mail\n\
+#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n\
+Serviciu Registru pentru replicare email"
     IDS_EXPORT_WIZARD "Asistent de exportare a certificatelor"
     IDS_EXPORT_FORMAT_TITLE "Format pentru exportare"
     IDS_EXPORT_FORMAT_SUBTITLE "Alegeți formatul în care va fi salvat conținutul."
@@ -183,18 +235,14 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Instalare certificat...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Instalare certificat...", IDC_ADDTOSTORE,93,216,75,14
+  PUSHBUTTON "&Declarația emitentului", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "&Declarația emitentului", IDC_ISSUERSTATEMENT,172,216,75,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
@@ -203,15 +251,12 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Afișează:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 38,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Editare proprietăți...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Copiere în fișier...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Editare proprietăți...", IDC_EDITPROPERTIES,103,216,70,14
-  PUSHBUTTON "&Copiere în fișier...", IDC_EXPORT,177,216,70,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -222,8 +267,8 @@ BEGIN
   GROUPBOX "Cale de certi&ficare", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Vizualizează certificat", IDC_VIEWCERTIFICATE,170,156,75,14
+  PUSHBUTTON "&Vizualizează certificat", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "&Stare certificat:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "&Stare certificat:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -235,8 +280,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Închide", IDOK,103,216,70,14
+  PUSHBUTTON "Închide", IDOK,73,216,85,14
-  PUSHBUTTON "Alte &informații", IDC_CPS,177,216,70,14
+  PUSHBUTTON "Alte &informații", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -245,20 +290,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Nume uzual:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Descriere:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Rolurile certificatului", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Rolurile certificatului", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "Activ&ează toate rolurile acestui certificat",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Dezact&ivează toate rolurile acestui certificat",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Activează d&oar următoarele roluri ale acestui certificat:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,190,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Adăugare &rol...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Adăugare &rol...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -273,14 +318,13 @@ BEGIN
 END
 
 IDD_SELECT_STORE DIALOG 0,0,200,136
-CAPTION "Selectați depozitul de certificate"
+CAPTION "Selectare depozit de certificate"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Selectați depozitul de certificate pe care doriți să-l utilizați:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "Afișea&ză depozitele fizice", IDC_SHOW_PHYSICAL_STORES, 6,102,100,14,
+  CHECKBOX "Afișea&ză depozitele fizice", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Renunță", IDCANCEL, 144,118,50,14
 END
@@ -289,14 +333,9 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Asistent de importare a certificatelor"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Bun venit în Asistentul de importare a certificatelor", IDC_IMPORT_TITLE,
+  LTEXT "Bun venit în Asistentul de importare a certificatelor", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Acest asistent vă ajută să importați certificate, liste de certificate revocate și liste de certificate acreditate dintr-un fișier într-un depozit de certificate.",
-    -1, 115,26,195,25
   LTEXT "Un certificat poate fi utilizat pentru identificarea proprie sau a calculatorului cu care comunicați.  Poate fi utilizat și pentru autentificare sau pentru a semna mesaje.  Depozitele de certificate sunt colecții de certificate, liste de certificate revocate și liste de certificate acreditate.",
-    -1, 115,56,195,40
+    -1, 115,40,195,120
-  LTEXT "Pentru a continua, apăsați pe Înainte.",
-    -1, 115,103,195,8
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
@@ -305,7 +344,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Nume &fișier:", -1, 21,1,195,10
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "Naviga&re...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "&Navighează", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Notă:  Următoarele formate de fișier pot conține mai multe certificate, liste de certificate revocate sau liste de certificate acreditate:",
     -1, 21,30,265,16
   LTEXT "Standard sintaxă mesaje criptografice/Mesaje PKCS #7 (.p7b)",
@@ -321,13 +360,13 @@ CAPTION "Asistent de importare a certificatelor"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine poate selecta automat depozitul de certificate sau puteți să specificați o locație pentru certificate.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "Selectează &automat depozitul de certificate",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Plasează toate certificatele în următorul depozit:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "Naviga&re...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "&Navighează", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
@@ -350,19 +389,16 @@ CAPTION "Certificate"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Rolul i&ntenționat:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Importare...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Exportare...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Elimină", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Importare...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Avansate...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Exportare...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "Ște&rge", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Avansate...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Rolurile intenționate ale certificatului", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "&Vizualizare...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Vizualizare", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
   PUSHBUTTON "În&chide", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
@@ -385,14 +421,9 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Asistent de exportare a certificatelor"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Bun venit în Asistentul de exportare a certificatelor", IDC_EXPORT_TITLE,
+  LTEXT "Bun venit în Asistentul de exportare a certificatelor", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Acest asistent vă ajută să exportați certificate, liste de certificate revocate și liste de certificate acreditate dintr-un depozit de certificate într-un fișier.",
-    -1, 115,26,195,25
   LTEXT "Un certificat poate fi utilizat pentru identificarea proprie sau a calculatorului cu care comunicați.  Poate fi utilizat și pentru autentificare sau pentru a semna mesaje.  Depozitele de certificate sunt colecții de certificate, liste de certificate revocate și liste de certificate acreditate.",
-    -1, 115,56,195,40
+    -1, 115,40,195,120
-  LTEXT "Pentru a continua, apăsați pe Înainte.",
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
@@ -412,7 +443,7 @@ IDD_EXPORT_PASSWORD DIALOG 0,0,317,143
 CAPTION "Asistent de exportare a certificatelor"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "&Parola:", -1, 21,1,195,10
+  LTEXT "&Parolă:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Confirmați parola:", -1, 21,35,195,10
   EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP
@@ -424,23 +455,21 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Selectați formatul pe care doriți să îl utilizați:", -1, 21,1,195,10
   AUTORADIOBUTTON "Binar X.509 codificat în &DER (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "X.509 codificat în ba&se64 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Standard sintaxă mesaje &criptografice/Mesaj PKCS #7 (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Include toate certificatele din calea de certificare, dacă este posibil",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "Schimb de informații &personale/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Incl&ude toate certificatele din calea de certificare, dacă este posibil",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Activ&ează criptarea puternică",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Șterge c&heia privată dacă exportarea reușește",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143
@@ -449,7 +478,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Nume &fișier:", -1, 21,1,195,10
   EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
-  PUSHBUTTON "Naviga&re...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
+  PUSHBUTTON "&Navighează", IDC_EXPORT_BROWSE_FILE, 236,11,60,14
 END
 
 IDD_EXPORT_FINISH DIALOG 0,0,317,178

reactos/dll/win32/cryptui/cryptui_Uk.rc

@@ -2,7 +2,6 @@
  * cryptui dll resources
  *
  * Copyright 2008 Juan Lang
- * Copyright 2010 Igor Paliychuk
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,9 +20,6 @@
 
 #include "cryptuires.h"
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
@@ -59,8 +55,8 @@ STRINGTABLE
     IDS_FIELD_VALID_TO "Дійсний до"
     IDS_FIELD_SUBJECT "Предмет"
     IDS_FIELD_PUBLIC_KEY "Публічний ключ"
-    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)"
+    IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d біт)"
-    IDS_PROP_HASH "SHA1 hash"
+    IDS_PROP_HASH "SHA1 хеш"
     IDS_PROP_ENHKEY_USAGE "Розширене використання ключа (властивість)"
     IDS_PROP_FRIENDLY_NAME "Дружня назва"
     IDS_PROP_DESCRIPTION "Опис"
@@ -108,23 +104,34 @@ STRINGTABLE
     IDS_FRIENDLY_NAME_COLUMN "Дружня назва"
     IDS_ALLOWED_PURPOSE_ALL "<Всі>"
     IDS_ALLOWED_PURPOSE_NONE "<Немає>"
-    IDS_WARN_REMOVE_MY "Ви більше не зможете розшифровувати чи підписувати повідомлення цим сертифікатом.\nВи дійсно хочете видалити цей сертифікат?"
+    IDS_WARN_REMOVE_MY "Ви більше не зможете розшифровувати чи підписувати повідомлення цим сертифікатом.\n\
-    IDS_WARN_REMOVE_PLURAL_MY "Ви більше не зможете розшифровувати чи підписувати повідомлення цими сертифікатами.\nВи дійсно хочете видалити ці сертифікати?"
+Ви дійсно хочете видалити цей сертифікат?"
-    IDS_WARN_REMOVE_ADDRESSBOOK "Ви більше не зможете зашифровувати чи перевіряти повідомлення цим сертифікатом.\nВи дійсно хочете видалити цей сертифікат?"
+    IDS_WARN_REMOVE_PLURAL_MY "Ви більше не зможете розшифровувати чи підписувати повідомлення цими сертифікатами.\n\
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Ви більше не зможете зашифровувати чи перевіряти повідомлення цими сертифікатами.\nВи дійсно хочете видалити ці сертифікати?"
+Ви дійсно хочете видалити ці сертифікати?"
-    IDS_WARN_REMOVE_CA "Сертифікати, видані цим органом сертифікації, втратять довіру.\nВи дійсно хочете видалити цей сертифікат?"
+    IDS_WARN_REMOVE_ADDRESSBOOK "Ви більше не зможете зашифровувати чи перевіряти повідомлення цим сертифікатом.\n\
-    IDS_WARN_REMOVE_PLURAL_CA "Сертифікати, видані цими органами сертифікації, втратять довіру.\nВи дійсно хочете видалити ці сертифікати?"
+Ви дійсно хочете видалити цей сертифікат?"
-    IDS_WARN_REMOVE_ROOT "Сертифікати, видані цим органом кореневої сертифікації, чи іншим органом сертифікації, який їх видав, втратять довіру.\nВи дійсно хочете видалити цей довірений кореневий сертифікат?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Ви більше не зможете зашифровувати чи перевіряти повідомлення цими сертифікатами.\n\
-    IDS_WARN_REMOVE_PLURAL_ROOT "Сертифікати, видані цими органами кореневої сертифікації, чи іншими органами сертифікації, які їх видали, втратять довіру.\nВи дійсно хочете видалити ці довірені кореневі сертифікати?"
+Ви дійсно хочете видалити ці сертифікати?"
-    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "ПЗ, підписане цим видавцем втратить довіру.\nВи дійсно хочете видалити цей сертифікат?"
+    IDS_WARN_REMOVE_CA "Сертифікати, видані цим органом сертифікації, втратять довіру.\n\
-    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "ПЗ, підписане цими видавцями втратить довіру.\nВи дійсно хочете видалити ці сертифікати?"
+Ви дійсно хочете видалити цей сертифікат?"
+    IDS_WARN_REMOVE_PLURAL_CA "Сертифікати, видані цими органами сертифікації, втратять довіру.\n\
+Ви дійсно хочете видалити ці сертифікати?"
+    IDS_WARN_REMOVE_ROOT "Сертифікати, видані цим органом кореневої сертифікації, чи іншим органом сертифікації, який їх видав, втратять довіру.\n\
+Ви дійсно хочете видалити цей довірений кореневий сертифікат?"
+    IDS_WARN_REMOVE_PLURAL_ROOT "Сертифікати, видані цими органами кореневої сертифікації, чи іншими органами сертифікації, які їх видали, втратять довіру.\n\
+Ви дійсно хочете видалити ці довірені кореневі сертифікати?"
+    IDS_WARN_REMOVE_TRUSTEDPUBLISHER "ПЗ, підписане цим видавцем втратить довіру.\n\
+Ви дійсно хочете видалити цей сертифікат?"
+    IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "ПЗ, підписане цими видавцями втратить довіру.\n\
+Ви дійсно хочете видалити ці сертифікати?"
     IDS_WARN_REMOVE_DEFAULT "Ви дійсно хочете видалити цей сертифікат?"
     IDS_WARN_REMOVE_PLURAL_DEFAULT "Ви дійсно хочете видалити ці сертифікати?"
     IDS_CERT_MGR "Сертифікати"
     IDS_FRIENDLY_NAME_NONE "<Немає>"
     IDS_PURPOSE_SERVER_AUTH "Забезпечує ідентифікацію віддаленого комп'ютера"
     IDS_PURPOSE_CLIENT_AUTH "Забезпечує ваше виявлення на віддаленому комп'ютері"
-    IDS_PURPOSE_CODE_SIGNING "Гарантує, що програмне забезпечення прийшло від\n видавця ПЗ.Захищає ПЗ від змін після публікації"
+    IDS_PURPOSE_CODE_SIGNING "Гарантує, що програмне забезпечення прийшло від\n\
+ видавця ПЗ.Захищає ПЗ від змін після публікації"
     IDS_PURPOSE_EMAIL_PROTECTION "Захищає повідомлення e-mail"
     IDS_PURPOSE_IPSEC "Забезпечує безпечний зв'язок через Інтернет"
     IDS_PURPOSE_TIMESTAMP_SIGNING "Дозволяє підписати дані поточним часом"
@@ -183,35 +190,28 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
-  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26
-    ES_READONLY|WS_DISABLED,8,11,26,26
+  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
-    ES_READONLY|WS_DISABLED,34,11,212,26
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
-  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78
-    ES_READONLY|ES_MULTILINE,8,38,238,78
   CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
-  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
+  CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
-    ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
+  PUSHBUTTON "&Встановити сертифікат...", IDC_ADDTOSTORE,53,216,95,14
-  PUSHBUTTON "&Встановити сертифікат...", IDC_ADDTOSTORE,83,216,90,14
+  PUSHBUTTON "&Заява видавця", IDC_ISSUERSTATEMENT,152,216,95,14
-  PUSHBUTTON "&Заява видавця", IDC_ISSUERSTATEMENT,177,216,70,14
 END
 
 IDD_DETAIL DIALOG 0, 0, 255, 236
-CAPTION "Деталі"
+CAPTION "Подробиці"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Показати:", -1, 6,12,40,14
-  COMBOBOX IDC_DETAIL_SELECT, 40,10,100,14,
+  COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_DETAIL_LIST, "SysListView32",
-    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
+    LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100
-    6,28,241,100
+  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
-  CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W",
+  PUSHBUTTON "&Змінити властивості...", IDC_EDITPROPERTIES,53,216,95,14
-    ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70
+  PUSHBUTTON "&Копіювати в файл...", IDC_EXPORT,152,216,95,14
-  PUSHBUTTON "&Змінити властивості...", IDC_EDITPROPERTIES,91,216,80,14
-  PUSHBUTTON "&Копіювати в файл...", IDC_EXPORT,175,216,72,14
 END
 
 IDD_HIERARCHY DIALOG 0, 0, 255, 236
@@ -222,8 +222,8 @@ BEGIN
   GROUPBOX "&Шлях сертифікації", -1,6,10,245,165, BS_GROUPBOX
   CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER,
     13,22,231,130
-  PUSHBUTTON "&Перегляд сертифікату", IDC_VIEWCERTIFICATE,167,156,78,14
+  PUSHBUTTON "&Перегляд сертифікату", IDC_VIEWCERTIFICATE,155,156,90,14
-  LTEXT "&Стан сертифікату:", IDC_CERTIFICATESTATUS,6,183,70,14
+  LTEXT "&Стан сертифікату:", IDC_CERTIFICATESTATUS,6,183,200,14
   CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36
 END
@@ -235,8 +235,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", IDC_USERNOTICE,"RichEdit20W",
     WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200
-  PUSHBUTTON "Закрити", IDOK,103,216,70,14
+  PUSHBUTTON "Закрити", IDOK,73,216,85,14
-  PUSHBUTTON "&Детальніше", IDC_CPS,177,216,70,14
+  PUSHBUTTON "&Детальніше", IDC_CPS,162,216,85,14
 END
 
 IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236
@@ -245,20 +245,20 @@ STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Дружня назва:", -1, 6,14,60,14
-  EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP
+  EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP
   LTEXT "&Опис:", -1, 6,32,60,14
-  EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
+  EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Цілі сертифікату", -1,6,48,245,165, BS_GROUPBOX
+  GROUPBOX "Цілі сертифікату", -1,6,48,245,185, BS_GROUPBOX
   AUTORADIOBUTTON "&Ввімкнути всі цілі для цього сертифікату",
-    IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "В&имкнути всі цілі для цього сертифікату",
-    IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON
+    IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "Ввімкнути &лише наступні цілі для цього сертифікату:",
-    IDC_ENABLE_SELECTED_PURPOSES, 12,82,188,14, BS_AUTORADIOBUTTON
+    IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
-    24,100,220,90
+    24,100,220,106
-  PUSHBUTTON "Додати &ціль...", IDC_ADD_PURPOSE,184,194,60,14
+  PUSHBUTTON "Додати &ціль...", IDC_ADD_PURPOSE,174,212,70,14
 END
 
 IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68
@@ -279,8 +279,7 @@ BEGIN
   LTEXT "Виберіть потрібне сховище сертифікатів:", IDC_STORE_TEXT, 6,6,190,28
   CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,
     6,28,188,70
-  CHECKBOX "&Показати фізичні сховища", IDC_SHOW_PHYSICAL_STORES, 6,102,102,14,
+  CHECKBOX "&Показати фізичні сховища", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP
-    BS_AUTOCHECKBOX|WS_TABSTOP
   PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON
   PUSHBUTTON "Скасувати", IDCANCEL, 144,118,50,14
 END
@@ -289,14 +288,9 @@ IDD_IMPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Майстер імпорту сертифікатів"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Вас вітає Майстер імпорту сертифікатів", IDC_IMPORT_TITLE,
+  LTEXT "Вас вітає Майстер імпорту сертифікатів", IDC_IMPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Цей майстер допоможе імпортувати сертифікати, списки анульованих сертифікатів та списки довірених сертифікатів з файлу до сховища сертифікатів.",
-    -1, 115,26,195,25
   LTEXT "Сертифікат може бути використаний для вашої ідентифікації або ідентифікації комп'ютера, з яким ви з'єднані.  Також він може бути використаний для завірення і для підписуваня повідомлень.  Сховищами сертифікатів є колекції сертифікатів, списки анульованих сертифікатів та списки довірених сертифікатів.",
-    -1, 115,52,195,48
+    -1, 115,40,195,120
-  LTEXT "Для продовження натисніть Далі.",
-    -1, 115,103,195,8
 END
 
 IDD_IMPORT_FILE DIALOG 0,0,317,178
@@ -307,13 +301,13 @@ BEGIN
   EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP
   PUSHBUTTON "&Огляд...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Увага:  Наступні формати файлів можуть містити більше одного сертифікату, списку анульованих сертифікатів, чи списку довірених сертифікатів:",
-    -1, 21,26,265,16
+    -1, 21,30,265,16
   LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)",
-    -1, 31,49,265,10
+    -1, 31,53,265,10
   LTEXT "Обмін особистою інформацією/PKCS #12 (.pfx, .p12)",
-    -1, 31,64,265,10
+    -1, 31,68,265,10
   LTEXT "Сховище серійних сертифікатів Microsoft (.sst)",
-    -1, 31,79,265,10
+    -1, 31,83,265,10
 END
 
 IDD_IMPORT_STORE DIALOG 0,0,317,143
@@ -321,13 +315,13 @@ CAPTION "Майстер імпорту сертифікатів"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Wine може автоматично вибрати сховище сертифікатів, або ви можете вказати місце для сертифікатів.",
-    -1, 21,1,195,20
+    -1, 21,1,220,25
   AUTORADIOBUTTON "&Автоматично вибрати сховище сертифікатів",
-    IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "&Помістити всі сертифікати в наступне сховище:",
-    IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON
+    IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON
-  EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY
+  EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY
-  PUSHBUTTON "&Огляд...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14
+  PUSHBUTTON "&Огляд...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14
 END
 
 IDD_IMPORT_FINISH DIALOG 0,0,317,178
@@ -350,20 +344,17 @@ CAPTION "Сертифікати"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "&Призначена ціль:", -1, 7,9,100,12
-  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
+  COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
-    CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
+  CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
-  CONTROL "", IDC_MGR_STORES, "SysTabControl32",
+  CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
-    WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140
+  PUSHBUTTON "&Імпорт...", IDC_MGR_IMPORT, 7,172,65,14
-  CONTROL "", IDC_MGR_CERTS, "SysListView32",
+  PUSHBUTTON "&Експорт...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED
-    LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111
+  PUSHBUTTON "&Видалити", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED
-  PUSHBUTTON "&Імпорт...", IDC_MGR_IMPORT, 7,172,51,14
+  PUSHBUTTON "&Додатково...", IDC_MGR_ADVANCED, 263,172,65,14
-  PUSHBUTTON "&Експорт...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Видалити", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED
-  PUSHBUTTON "&Додатково...", IDC_MGR_ADVANCED, 277,172,51,14
   GROUPBOX "Призначені цілі сертифікату", -1,7,194,321,47, BS_GROUPBOX
-  LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30
+  LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32
-  PUSHBUTTON "Пе&регляд...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
+  PUSHBUTTON "&Вигляд", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED
-  PUSHBUTTON "&Закрити", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
+  PUSHBUTTON "За&крити", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON
 END
 
 IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176
@@ -385,14 +376,9 @@ IDD_EXPORT_WELCOME DIALOG 0,0,317,143
 CAPTION "Майстер експорту сертифікатів"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Вас вітає Майстер експорту сертифікатів", IDC_EXPORT_TITLE,
+  LTEXT "Вас вітає Майстер експорту сертифікатів", IDC_EXPORT_TITLE, 115,7,195,30
-    115,7,195,12
-  LTEXT "Цей майстер допоможе імпортувати сертифікати, списки анульованих сертифікатів та списки довірених сертифікатів з сховища сертифікатів до файлу.",
-    -1, 115,26,195,25
   LTEXT "Сертифікат може бути використаний для вашої ідентифікації або ідентифікації комп'ютера, з яким ви з'єднані.  Також він може бути використаний для завірення і для підписуваня повідомлень.  Сховищами сертифікатів є колекції сертифікатів, списки анульованих сертифікатів та списки довірених сертифікатів.",
-    -1, 115,52,195,48
+    -1, 115,40,195,120
-  LTEXT "Для продовження натисніть Далі.",
-    -1, 115,103,195,8
 END
 
 IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143
@@ -424,23 +410,21 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Виберіть формат, який ви хочете використати:", -1, 21,1,195,10
   AUTORADIOBUTTON "&DER-encoded X.509 (.cer)",
-    IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP
+    IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP
   AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):",
-    IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)",
-    IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON
+    IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON
   CHECKBOX "&Включити всі сертифікати за сертифікаційним шляхом якщо можливо",
-    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,245,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   AUTORADIOBUTTON "&Обмін особистою інформацією/PKCS #12 (.pfx)",
-    IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED
+    IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED
   CHECKBOX "Включити вс&і сертифікати за сертифікаційним шляхом якщо можливо",
-    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,245,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
+    IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "&Ввімкнути сильне шифрування",
-    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8,
+    IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
   CHECKBOX "Видалити приватний &ключ після успішного експорту",
-    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8,
+    IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
-    BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED
 END
 
 IDD_EXPORT_FILE DIALOG 0,0,317,143

reactos/dll/win32/cryptui/main.c

@@ -27,7 +27,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winuser.h"
-#include "undocuser.h"
 #include "softpub.h"
 #include "wingdi.h"
 #include "richedit.h"
@@ -1165,20 +1164,19 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
             break;
         case LVN_ITEMCHANGED:
         {
-            NMITEMACTIVATE *nm;
+            WCHAR empty[] = { 0 };
+            NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp;
             HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS);
+            int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0);
 
-            nm = (NMITEMACTIVATE*)lp;
+            EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0);
-            if (nm->uNewState & LVN_ITEMACTIVATE)
+            EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0);
-            {
+            EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1);
-                int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0);
+            if (numSelected == 1)
-
+                cert_mgr_show_cert_usages(hwnd, nm->iItem);
-                EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0);
+            else
-                EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0);
+                SendMessageW(GetDlgItem(hwnd, IDC_MGR_PURPOSES), WM_SETTEXT, 0,
-                EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1);
+                 (LPARAM)empty);
-                if (numSelected == 1)
-                    cert_mgr_show_cert_usages(hwnd, nm->iItem);
-            }
             break;
         }
         case NM_DBLCLK:
@@ -1283,7 +1281,6 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
         case IDCANCEL:
             free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS));
             close_stores(GetDlgItem(hwnd, IDC_MGR_STORES));
-            close_stores(GetDlgItem(hwnd, IDC_MGR_STORES));
             data = (struct CertMgrData *)GetWindowLongPtrW(hwnd, DWLP_USER);
             ImageList_Destroy(data->imageList);
             HeapFree(GetProcessHeap(), 0, data);
@@ -1639,7 +1636,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info)
         SetLastError(E_INVALIDARG);
         return NULL;
     }
-    memcpy(&infoW, &info, sizeof(info));
+    memcpy(&infoW, info, sizeof(*info));
     if (info->pszTitle)
     {
         len = MultiByteToWideChar(CP_ACP, 0, info->pszTitle, -1, NULL, 0);
@@ -1969,23 +1966,19 @@ static struct OIDToString oidMap[] = {
 
 static struct OIDToString *findSupportedOID(LPCSTR oid)
 {
-    int indexHigh = sizeof(oidMap) / sizeof(oidMap[0]) - 1, indexLow = 0, i;
+    int indexHigh = sizeof(oidMap) / sizeof(oidMap[0]) - 1, indexLow = 0;
-    struct OIDToString *ret = NULL;
 
-    for (i = (indexLow + indexHigh) / 2; !ret && indexLow <= indexHigh;
+    while (indexLow <= indexHigh)
-     i = (indexLow + indexHigh) / 2)
     {
-        int cmp;
+        int cmp, i = (indexLow + indexHigh) / 2;
-
+        if (!(cmp = strcmp(oid, oidMap[i].oid)))
-        cmp = strcmp(oid, oidMap[i].oid);
+            return &oidMap[i];
-        if (!cmp)
+        if (cmp > 0)
-            ret = &oidMap[i];
-        else if (cmp > 0)
             indexLow = i + 1;
         else
             indexHigh = i - 1;
     }
-    return ret;
+    return NULL;
 }
 
 static void add_local_oid_text_to_control(HWND text, LPCSTR oid)
@@ -2711,6 +2704,8 @@ static WCHAR *field_format_public_key(PCCERT_CONTEXT cert)
         if (LoadStringW(hInstance, IDS_FIELD_PUBLIC_KEY_FORMAT, fmt,
          sizeof(fmt) / sizeof(fmt[0])))
         {
+            DWORD len;
+
             /* Allocate the output buffer.  Use the number of bytes in the
              * public key as a conservative (high) estimate for the number of
              * digits in its output.
@@ -2720,14 +2715,18 @@ static WCHAR *field_format_public_key(PCCERT_CONTEXT cert)
              * good idea, but as this isn't a sentence fragment, it shouldn't
              * be word-order dependent.
              */
-            buf = HeapAlloc(GetProcessHeap(), 0,
+            len = strlenW(fmt) + strlenW(oidInfo->pwszName) +
-             (strlenW(fmt) + strlenW(oidInfo->pwszName) +
+                cert->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData * 8;
-             cert->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData * 8)
+            buf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*buf));
-             * sizeof(WCHAR));
             if (buf)
-                sprintfW(buf, fmt, oidInfo->pwszName,
+            {
-                 CertGetPublicKeyLength(X509_ASN_ENCODING,
+                DWORD_PTR args[2];
-                  &cert->pCertInfo->SubjectPublicKeyInfo));
+                args[0] = (DWORD_PTR)oidInfo->pwszName;
+                args[1] = CertGetPublicKeyLength(X509_ASN_ENCODING,
+                              &cert->pCertInfo->SubjectPublicKeyInfo);
+                FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                               fmt, 0, 0, buf, len, (__ms_va_list*)args);
+            }
         }
     }
     return buf;
@@ -3084,7 +3083,7 @@ struct selection_list_item
     add_fields_func add;
 };
 
-const struct selection_list_item listItems[] = {
+static const struct selection_list_item listItems[] = {
  { IDS_FIELDS_ALL, add_all_fields },
  { IDS_FIELDS_V1, add_v1_fields },
  { IDS_FIELDS_EXTENSIONS, add_all_extensions },
@@ -4042,8 +4041,8 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data)
             tvis.u.item.pszText = name;
             tvis.u.item.state = TVIS_EXPANDED;
             tvis.u.item.stateMask = TVIS_EXPANDED;
-            if (i == 1 &&
+            if (i == 1 && (!provSigner->pChainContext ||
-             (provSigner->pChainContext->TrustStatus.dwErrorStatus &
+             provSigner->pChainContext->TrustStatus.dwErrorStatus &
              CERT_TRUST_IS_PARTIAL_CHAIN))
             {
                 /* The root of the chain has a special case:  if the chain is
@@ -4286,7 +4285,6 @@ static BOOL init_hierarchy_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo,
 static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp)
 {
     RECT rc;
-    POINT topLeft;
 
     TRACE("(%p, %08x, %08lx)\n", hwnd, msg, lp);
 
@@ -4295,17 +4293,12 @@ static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp)
     case PSCB_INITIALIZED:
         /* Get cancel button's position.. */
         GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rc);
-        topLeft.x = rc.left;
+        MapWindowPoints( 0, hwnd, (POINT *)&rc, 2 );
-        topLeft.y = rc.top;
-        ScreenToClient(hwnd, &topLeft);
         /* hide the cancel button.. */
         ShowWindow(GetDlgItem(hwnd, IDCANCEL), FALSE);
-        /* get the OK button's size.. */
-        GetWindowRect(GetDlgItem(hwnd, IDOK), &rc);
         /* and move the OK button to the cancel button's original position. */
-        MoveWindow(GetDlgItem(hwnd, IDOK), topLeft.x, topLeft.y,
+        SetWindowPos(GetDlgItem(hwnd, IDOK), 0, rc.left, rc.top, 0, 0,
-         rc.right - rc.left, rc.bottom - rc.top, FALSE);
+                     SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW );
-        GetWindowRect(GetDlgItem(hwnd, IDOK), &rc);
         break;
     }
     return 0;
@@ -4436,7 +4429,7 @@ BOOL WINAPI CryptUIDlgViewCertificateW(
     }
     /* Make a local copy in case we have to call WinVerifyTrust ourselves */
     memcpy(&viewInfo, pCertViewInfo, sizeof(viewInfo));
-    if (!viewInfo.u.hWVTStateData)
+    if (!pCertViewInfo->u.hWVTStateData)
     {
         memset(&wvt, 0, sizeof(wvt));
         wvt.cbStruct = sizeof(wvt);
@@ -4478,7 +4471,7 @@ BOOL WINAPI CryptUIDlgViewCertificateW(
     if (ret)
     {
         ret = show_cert_dialog(&viewInfo, provCert, pfPropertiesChanged);
-        if (!viewInfo.u.hWVTStateData)
+        if (!pCertViewInfo->u.hWVTStateData)
         {
             wvt.dwStateAction = WTD_STATEACTION_CLOSE;
             WinVerifyTrust(NULL, &generic_cert_verify, &wvt);
@@ -4929,7 +4922,7 @@ static const WCHAR filter_cms[] = { '*','.','s','p','c',';','*','.',
  'p','7','b',0 };
 static const WCHAR filter_all[] = { '*','.','*',0 };
 
-struct StringToFilter
+static struct StringToFilter
 {
     int     id;
     DWORD   allowFlags;
@@ -5484,7 +5477,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent,
     data.autoDest = TRUE;
     data.success = TRUE;
 
-    memset(&pages, 0, sizeof(pages));
+    memset(pages, 0, sizeof(pages));
 
     pages[nPages].dwSize = sizeof(pages[0]);
     pages[nPages].hInstance = hInstance;
@@ -6897,7 +6890,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent,
     data.file = INVALID_HANDLE_VALUE;
     data.success = FALSE;
 
-    memset(&pages, 0, sizeof(pages));
+    memset(pages, 0, sizeof(pages));
 
     pages[nPages].dwSize = sizeof(pages[0]);
     pages[nPages].hInstance = hInstance;
@@ -7046,3 +7039,21 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent,
     }
     return ret;
 }
+
+BOOL WINAPI CryptUIDlgViewSignerInfoA(CRYPTUI_VIEWSIGNERINFO_STRUCTA *pcvsi)
+{
+    FIXME("%p: stub\n", pcvsi);
+    return FALSE;
+}
+
+PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_STRUCTW pcsc)
+{
+    FIXME("%p: stub\n", pcsc);
+    return NULL;
+}
+
+PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_STRUCTA pcsc)
+{
+    FIXME("%p: stub\n", pcsc);
+    return NULL;
+}

reactos/media/doc/README.WINE

@@ -56,7 +56,7 @@ reactos/dll/win32/crypt32         # Synced to Wine-1.3.37
 reactos/dll/win32/cryptdlg        # Synced to Wine-1.3.37
 reactos/dll/win32/cryptdll        # Synced to Wine-1.3.37
 reactos/dll/win32/cryptnet        # Synced to Wine-1.3.37
-reactos/dll/win32/cryptui         # Autosync
+reactos/dll/win32/cryptui         # Synced to Wine-1.3.37
 reactos/dll/win32/dbghelp         # Autosync
 reactos/dll/win32/dciman32        # Autosync
 reactos/dll/win32/dwmapi          # Synced to Wine-1.3.37