Merge treeview-redux to trunk

svn path=/trunk/netsurf/; revision=10865

7 files changed, 63 insertions, 10 deletions

diff --git a/!NetSurf/Resources/Icons/content.png b/!NetSurf/Resources/Icons/content.png
new file mode 100644
index 000000000..53234c38c
--- /dev/null
+++ b/!NetSurf/Resources/Icons/content.png
diff --git a/!NetSurf/Resources/Icons/directory.png b/!NetSurf/Resources/Icons/directory.png
new file mode 100644
index 000000000..de3d7687f
--- /dev/null
+++ b/!NetSurf/Resources/Icons/directory.png
diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages
index 175f20008..0349c6f7c 100644
--- a/!NetSurf/Resources/de/Messages
+++ b/!NetSurf/Resources/de/Messages
@@ -189,6 +189,8 @@ ResetUsage:Statistik zurücksetzen
 New:Neu
 Expand:Expandieren
 Collapse:Zusammenfalten
+Tree:Tree
+TreeExport:Export...
 
 # New hotlist entry menu
 #
@@ -200,6 +202,7 @@ Link:Eintrag
 All:Alles
 Folders:Verzeichnisse
 Links:Einträge
+Domains:Domains
 
 # Other menus
 #
@@ -373,6 +376,13 @@ DateYesterday:Gestern
 Date1Week:vorige Woche
 Date2Week:vor 2 Wochen
 Date3Week:vor 3 Wochen
+Sunday:Sunday
+Monday:Monday
+Tuesday:Tuesday
+Wednesday:Wednesday
+Thursday:Thursday
+Friday:Friday
+Saturday:Saturday
 
 
 # Download user interface tokens
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages
index 6d62ac3cd..84ea3f69f 100644
--- a/!NetSurf/Resources/en/Messages
+++ b/!NetSurf/Resources/en/Messages
@@ -189,6 +189,8 @@ ResetUsage:Reset statistics
 New:New
 Expand:Expand
 Collapse:Collapse
+Tree:Tree
+TreeExport:Export...
 
 # New hotlist entry menu
 #
@@ -200,6 +202,7 @@ Link:Address
 All:All
 Folders:Directories
 Links:Addresses
+Domains:Domains
 
 # Other menus
 #
@@ -332,6 +335,7 @@ TreeNewFolder:New directory
 TreeLaunch:Visit URL
 TreeDelete:Delete
 
+
 # Tree export
 #
 TreeHotlist:NetSurf hotlist
@@ -374,6 +378,13 @@ DateYesterday:Yesterday
 Date1Week:Last week
 Date2Week:2 weeks ago
 Date3Week:3 weeks ago
+Sunday:Sunday
+Monday:Monday
+Tuesday:Tuesday
+Wednesday:Wednesday
+Thursday:Thursday
+Friday:Friday
+Saturday:Saturday
 
 
 # Download user interface tokens
@@ -534,6 +545,8 @@ gtkGlobalHistoryAccel:<ctrl><shift>h
 gtkAddBookMarks:_Add to Bookmarks…
 gtkShowBookMarks:_Show Bookmarks…
 gtkShowBookMarksAccel:F6
+gtkShowCookies:Show _Cookies…
+gtkShowCookiesAccel:F9
 gtkOpenLocation:_Open Location…
 gtkOpenLocationAccel:<ctrl>l
 
@@ -607,15 +620,15 @@ Cancel:Cancel
 #
 SSLCerts:SSL certificates
 SSLError:NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.
-Subject:Subject
-Issuer:Issuer
-Version:Version
-ValidFrom:Valid from
-ValidTo:Valid until
-Type:Type
-Serial:Serial
-Accept:Accept
-Reject:Reject
+SSL_Certificate_Subject:Subject: %s
+SSL_Certificate_Issuer:Issuer: %s
+SSL_Certificate_Version:Version: %ld
+SSL_Certificate_ValidFrom:Valid from: %s
+SSL_Certificate_ValidTo:Valid until: %s
+SSL_Certificate_Type:Type: %i
+SSL_Certificate_Serial:Serial: %ld
+SSL_Certificate_Accept:Accept
+SSL_Certificate_Reject:Reject
 
 
 # Content
@@ -723,7 +736,7 @@ Resolvers:No domain name servers are configured, so only browsing local files wi
 NoDiscSpace:Not enough space available on disc.
 Template:A window template is missing from the Templates file. Please reinstall NetSurf.
 HotlistSaveError:The hotlist was unable to be correctly saved.
-HotlistLoadError:The hotlist was unable to be correctly loaded.
+TreeLoadError:The tree was unable to be correctly loaded.
 NoDirError:%s is not a directory
 NoPathError:To save, drag the icon to a directory display
 NoNameError:Please enter a name
diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages
index bfe563d90..c16d0f09a 100644
--- a/!NetSurf/Resources/fr/Messages
+++ b/!NetSurf/Resources/fr/Messages
@@ -189,6 +189,8 @@ ResetUsage:RAZ des statistiques
 New:Nouveau
 Expand:Déployer
 Collapse:Regrouper
+Tree:Tree
+TreeExport:Export...
 
 # New hotlist entry menu
 #
@@ -200,6 +202,7 @@ Link:Adresse
 All:Tout
 Folders:Dossiers
 Links:Adresses
+Domains:Domains
 
 # Other menus
 #
@@ -373,6 +376,13 @@ DateYesterday:Hier
 Date1Week:La semaine dernière
 Date2Week:Il y a 2 semaines
 Date3Week:Il y a 3 semaines
+Sunday:Sunday
+Monday:Monday
+Tuesday:Tuesday
+Wednesday:Wednesday
+Thursday:Thursday
+Friday:Friday
+Saturday:Saturday
 
 
 # Download user interface tokens
diff --git a/!NetSurf/Resources/it/Messages b/!NetSurf/Resources/it/Messages
index e79ce93a5..7d4e834de 100755
--- a/!NetSurf/Resources/it/Messages
+++ b/!NetSurf/Resources/it/Messages
@@ -191,6 +191,8 @@ ResetUsage:Resetta statistiche
 New:Nuovo
 Expand:Espandi
 Collapse:Raggruppa
+Tree:Tree
+TreeExport:Export...
 
 # New hotlist entry menu
 #
@@ -202,6 +204,7 @@ Link:Indirizzo
 All:Tutte
 Folders:Cartelle
 Links:Indirizzi
+Domains:Domains
 
 # Other menus
 #
@@ -375,6 +378,13 @@ DateYesterday:Ieri
 Date1Week:Ultima settimana
 Date2Week:2 settimane fa
 Date3Week:3 settimane fa
+Sunday:Sunday
+Monday:Monday
+Tuesday:Tuesday
+Wednesday:Wednesday
+Thursday:Thursday
+Friday:Friday
+Saturday:Saturday
 
 
 # Download user interface tokens
diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages
index 2c1b3fa9b..f837f7dbd 100644
--- a/!NetSurf/Resources/nl/Messages
+++ b/!NetSurf/Resources/nl/Messages
@@ -189,6 +189,8 @@ ResetUsage:Statistiek op nul zetten
 New:Nieuw
 Expand:Uitklappen
 Collapse:Inklappen
+Tree:Tree
+TreeExport:Export...
 
 # New hotlist entry menu
 #
@@ -200,6 +202,7 @@ Link:Adres
 All:Alles
 Folders:Mappen
 Links:Adressen
+Domains:Domains
 
 # Other menus
 #
@@ -373,6 +376,13 @@ DateYesterday:gisteren
 Date1Week:vorige week
 Date2Week:2 weken geleden
 Date3Week:3 weken geleden
+Sunday:Sunday
+Monday:Monday
+Tuesday:Tuesday
+Wednesday:Wednesday
+Thursday:Thursday
+Friday:Friday
+Saturday:Saturday
 
 
 # Download user interface tokens