14 files changed, 38 insertions, 20 deletions

diff --git a/po/en.po b/po/en.po
index 6675f78b..c6fa98be 100644
--- a/po/en.po
+++ b/po/en.po
@@ -982,7 +982,7 @@ msgid "menu.page.upload"
 msgstr "Upload Page with Titan…"
 
 msgid "heading.upload"
-msgstr "UPLOAD WITH TITAN"
+msgstr "Upload with Titan"
 
 msgid "upload.id"
 msgstr "Identity:"
@@ -1239,7 +1239,7 @@ msgid "dlg.bookmark.icon"
 msgstr "Icon:"
 
 msgid "heading.bookmark.tags"
-msgstr "SPECIAL TAGS"
+msgstr "Special Tags"
 
 msgid "heading.addfolder"
 msgstr "ADD FOLDER"
@@ -1254,14 +1254,14 @@ msgid "dlg.addfolder"
 msgstr "Add Folder"
 
 msgid "heading.prefs"
-msgstr "PREFERENCES"
+msgstr "Preferences"
 
 # used on mobile
 msgid "heading.settings"
-msgstr "SETTINGS"
+msgstr "Settings"
 
 msgid "heading.prefs.certs"
-msgstr "CERTIFICATES"
+msgstr "Certificates"
 
 # tab button
 msgid "heading.prefs.colors"
@@ -1287,25 +1287,25 @@ msgid "heading.prefs.network"
 msgstr "Network"
 
 msgid "heading.prefs.paragraph"
-msgstr "PARAGRAPH"
+msgstr "Paragraph"
 
 msgid "heading.prefs.uitheme"
-msgstr "UI COLORS"
+msgstr "UI Colors"
 
 msgid "heading.prefs.pagecontent"
-msgstr "PAGE COLORS"
+msgstr "Page Colors"
 
 msgid "heading.prefs.proxies"
-msgstr "PROXIES"
+msgstr "Proxies"
 
 msgid "heading.prefs.scrolling"
-msgstr "SCROLLING"
+msgstr "Scrolling"
 
 msgid "heading.prefs.sizing"
-msgstr "SIZING"
+msgstr "Sizing"
 
 msgid "heading.prefs.widelayout"
-msgstr "WIDE LAYOUT"
+msgstr "Wide Layout"
 
 # tab button
 msgid "heading.prefs.style"
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 0b2edc4b..0129d019 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 6c0dc697..4acb5f16 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index 37438b3a..3fcecd44 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 1a512597..f9e134fc 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 58673ac5..6b98e1f8 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 0aaa2fbd..33ed890b 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index db1bd9e7..6dbeb129 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index ec375dcd..cfa284be 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index dd63c0eb..f0f6fe97 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/ui/certlistwidget.c b/src/ui/certlistwidget.c
index 4d939ae2..c67203e3 100644
--- a/src/ui/certlistwidget.c
+++ b/src/ui/certlistwidget.c
@@ -388,6 +388,7 @@ void init_CertListWidget(iCertListWidget *d) {
     init_ListWidget(&d->list);
     setId_Widget(w, "certlist");
     setBackgroundColor_Widget(w, none_ColorId);
+    setItemHeight_ListWidget(&d->list, 3.5f * lineHeight_Text(default_FontId));
     d->itemFonts[0] = uiContent_FontId;
     d->itemFonts[1] = uiContentBold_FontId;
 #if defined (iPlatformMobile)
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index c7b75d3f..9e4fef84 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "mobile.h"
 
 #include "app.h"
+#include "certlistwidget.h"
 #include "command.h"
 #include "defs.h"
 #include "inputwidget.h"
@@ -196,6 +197,8 @@ static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
         setText_LabelWidget(detailTitle, text_LabelWidget((iLabelWidget *) findTitleLabel_(panel)));
         setFlags_Widget(button, selected_WidgetFlag, iTrue);
         postCommand_Widget(topPanel, "panel.changed arg:%d", panelIndex);
+        //printTree_Widget(findDetailStack_(topPanel));
+//        updateVisible_ListWidget(findChild_Widget(findDetailStack_(topPanel), "certlist"));
         return iTrue;
     }
     if (equal_Command(cmd, "swipe.back")) {
@@ -482,7 +485,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                                                    collapse_WidgetFlag);
         setFont_LabelWidget(title, uiLabelLargeBold_FontId);
         setTextColor_LabelWidget(title, uiHeading_ColorId);
-        setAllCaps_LabelWidget(title, iTrue);
+//        setAllCaps_LabelWidget(title, iTrue);
         setId_Widget(as_Widget(title), id);
     }
     else if (equal_Command(spec, "heading")) {
@@ -609,6 +612,16 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
             setUserData_Object(widget, input);
         }
     }
+    else if (equal_Command(spec, "certlist")) {
+        iCertListWidget *certList = new_CertListWidget();
+        iListWidget *list = (iListWidget *) certList;
+        setBackgroundColor_Widget(as_Widget(list), uiBackgroundSidebar_ColorId);
+        widget = as_Widget(certList);
+        updateItems_CertListWidget(certList);
+        invalidate_ListWidget(list);
+        setFixedSize_Widget(widget,
+                            init_I2(-1, numItems_ListWidget(list) * itemHeight_ListWidget(list)));
+    }
     else if (equal_Command(spec, "button")) {
         widget = as_Widget(heading = makePanelButton_(label, item->command));
         setFlags_Widget(widget, selected_WidgetFlag, argLabel_Command(spec, "selected") != 0);
diff --git a/src/ui/root.c b/src/ui/root.c
index 5ed6b529..b7a2e5c8 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -339,14 +339,15 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         /* Current identity. */
         const iString     *docUrl = url_DocumentWidget(document_App());
         const iGmIdentity *ident  = identityForUrl_GmCerts(certs_App(), docUrl);
-        const iString     *fp     = collect_String(hexEncode_Block(&ident->fingerprint));
+        const iString     *fp     = ident ? collect_String(hexEncode_Block(&ident->fingerprint)) : NULL;
         pushBackN_Array(&items,
                         (iMenuItem[]){ { format_CStr("///" uiHeading_ColorEscape "%s",
                                                      ident ? cstr_String(name_GmIdentity(ident))
                                                            : "${menu.identity.notactive}") },
                                        { "---" } },
                         2);
-        /* Alternate identities. */ {
+        /* Alternate identities. */
+        if (ident) {
             const iString *site = collectNewRange_String(urlRoot_String(docUrl));
             iBool haveAlts = iFalse;
             iConstForEach(StringArray, i, strings_SiteSpec(site, usedIdentities_SiteSpecKey)) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 04483e8d..91b67e06 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1995,9 +1995,11 @@ iWidget *appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int sho
 }
 
 static void makeTwoColumnHeading_(const char *title, iWidget *headings, iWidget *values) {
-    addChildFlags_Widget(headings,
-                         iClob(makeHeading_Widget(format_CStr(uiHeading_ColorEscape "%s", title))),
-                         ignoreForParentWidth_WidgetFlag);
+    setFont_LabelWidget(addChildFlags_Widget(headings,
+                                             iClob(makeHeading_Widget(
+                                                 format_CStr(uiHeading_ColorEscape "%s", title))),
+                                             ignoreForParentWidth_WidgetFlag),
+                        uiLabelBold_FontId);
     addChild_Widget(values, iClob(makeHeading_Widget("")));
 }
 
@@ -2431,6 +2433,7 @@ iWidget *makePreferences_Widget(void) {
         };
         const iMenuItem identityPanelItems[] = {
             { "title id:sidebar.identities" },
+            { "certlist" },
             { NULL }  
         };
         iString *aboutText = collectNew_String(); {
@@ -2471,9 +2474,9 @@ iWidget *makePreferences_Widget(void) {
         return dlg;
     }
     iWidget *dlg = makeSheet_Widget("prefs");
-    addChildFlags_Widget(dlg,
+    setAllCaps_LabelWidget(addChildFlags_Widget(dlg,
                          iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.prefs}", NULL)),
-                         frameless_WidgetFlag);
+                         frameless_WidgetFlag), iTrue);
     iWidget *tabs = makeTabs_Widget(dlg);
     setBackgroundColor_Widget(findChild_Widget(tabs, "tabs.buttons"), uiBackgroundSidebar_ColorId);
     setId_Widget(tabs, "prefs.tabs");