Debarshi Ray · Debarshi Ray · Christian Hergert · Debarshi Ray · Christian Hergert · Philipp Kiemle
--- a/NEWS
+++ b/NEWS
+==============
+Version 3.42.0
+==============
+
+Changes in this release:
+
+ • Build system fixes for macOS
+ • Win32 fixes
+ • Panel fixes
+ • Allow DzlTaskCache to use NULL copy/free funcs
+ • Additional translations
+
 ==============
 Version 3.40.0
 ==============

--- a/meson.build
+++ b/meson.build
 project('libdazzle', 'c',
-          version: '3.40.0',
+          version: '3.42.0',
          license: 'GPLv3+',
    meson_version: '>= 0.50.0',
  default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
@@ -39,6 +39,12 @@ add_project_arguments([
  '-DDAZZLE_COMPILATION',
 ], language: 'c')

+if host_machine.system() == 'darwin'
+  add_project_arguments([
+    '-DPLATFORM_OSX',
+  ], language: 'c')
+endif
+
 root_inc = include_directories('.')
 src_inc = include_directories('src')

@@ -73,7 +79,6 @@ test_c_args = [
  '-Werror=shadow',
  '-Werror=strict-prototypes',
  '-Werror=trigraphs',
-  '-Werror=undef',
  '-Werror=write-strings',
  '-Wformat-nonliteral',
  ['-Werror=format-security', '-Werror=format=2' ],
@@ -95,7 +100,6 @@ test_c_args = [
  '-Wstrict-prototypes',
  '-Wswitch-default',
  '-Wswitch-enum',
-  '-Wundef',
  '-Wuninitialized',
  '-Wunused',
  '-fno-strict-aliasing',
@@ -118,7 +122,7 @@ hidden_visibility_args = []
 if get_option('default_library') != 'static'
  if host_machine.system() == 'windows'
    config_h.set('DLL_EXPORT', true)
-    if cc.get_id() == 'msvc'
+    if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
      config_h.set('_DZL_EXTERN', '__declspec(dllexport) extern')
    elif cc.has_argument('-fvisibility=hidden')
      config_h.set('_DZL_EXTERN', '__attribute__((visibility("default"))) __declspec(dllexport) extern')

--- a/po/LINGUAS
+++ b/po/LINGUAS
 # Please keep this list sorted alphabetically
+de
+zh_CN
--- a/po/de.po
+++ b/po/de.po
+# German translation for libdazzle.
+# Copyright (C) 2020 libdazzle's COPYRIGHT HOLDER
+# This file is distributed under the same license as the libdazzle package.
+# Tim Sabsch <tim@sabsch.com>, 2021.
+# Philipp Kiemle <philipp.kiemle@gmail.com>, 2020-2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libdazzle master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libdazzle/issues\n"
+"POT-Creation-Date: 2021-04-01 03:18+0000\n"
+"PO-Revision-Date: 2021-04-09 09:59+0200\n"
+"Last-Translator: Philipp Kiemle <philipp.kiemle@gmail.com>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.4.1\n"
+
+#: src/animation/dzl-animation.c:752
+#, c-format
+msgid "Cannot locate property %s in class %s"
+msgstr "Eigenschaft %s in der Klasse %s konnte nicht gefunden werden"
+
+#: src/animation/dzl-animation.c:1099 src/animation/dzl-animation.c:1105
+#, c-format
+msgid "Failed to find property %s in %s"
+msgstr "Eigenschaft %s in %s konnte nicht gefunden werden"
+
+#: src/animation/dzl-animation.c:1113
+#, c-format
+msgid "Failed to find property %s in %s or parent %s"
+msgstr ""
+"Eigenschaft %s konnte nicht in %s oder dem Elternobjekt %s gefunden werden"
+
+#: src/animation/dzl-animation.c:1123
+#, c-format
+msgid "Failed to retrieve va_list value: %s"
+msgstr "Empfangen des va_list-Wertes ist gescheitert: %s"
+
+#: src/files/dzl-directory-model.c:377
+msgid "Directory"
+msgstr "Ordner"
+
+#: src/files/dzl-directory-model.c:378
+msgid "The directory to list files from."
+msgstr "Dateien aus diesem Ordner auflisten."
+
+#: src/prefs/dzl-preferences-font-button.ui:57
+msgid "_Select"
+msgstr "Au_swählen"
+
+#: src/prefs/dzl-preferences-view.ui:15
+msgid "Search Preferences"
+msgstr "Sucheinstellungen"
+
+#: src/search/dzl-trie.c:782
+#, c-format
+msgid "Traversal order %u is not supported on DzlTrie."
+msgstr "Traversierungsreihenfolge %u wird nicht von DzlTrie unterstützt."
+
+#: src/shortcuts/dzl-shortcut-accel-dialog.c:446
+#: src/widgets/dzl-file-chooser-entry.c:168
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/shortcuts/dzl-shortcut-accel-dialog.c:447
+msgid "Set"
+msgstr "Festlegen"
+
+#. Translators: <b>%s</b> is used to show the provided text in bold
+#: src/shortcuts/dzl-shortcut-accel-dialog.c:504
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "Geben Sie eine neue Tastenkombination ein, um <b>%s</b> zu ändern."
+
+#: src/shortcuts/dzl-shortcut-accel-dialog.ui:43
+msgid "Press Escape to cancel or Backspace to disable."
+msgstr "Drücken Sie Esc zum Abbrechen oder die Rücktaste zum deaktivieren."
+
+#: src/shortcuts/dzl-shortcut-manager.c:219
+msgid "Default Shortcuts"
+msgstr "Standard-Tastenkombinationen"
+
+#: src/shortcuts/dzl-shortcuts-group.c:304
+#: src/shortcuts/dzl-shortcuts-section.c:364
+msgid "Title"
+msgstr "Titel"
+
+#: src/shortcuts/dzl-shortcuts-group.c:318
+msgid "View"
+msgstr "Ansicht"
+
+# Der Bereich im Shortcut-Fenster, der die Tastenkürzel anzeigt (im Vergleich zum Bereich, in dem die Namen der Kürzel stehen).
+# »Größen-Gruppe« bezieht sich auf eine GtkSizeGroup
+#: src/shortcuts/dzl-shortcuts-group.c:331
+#: src/shortcuts/dzl-shortcuts-group.c:332
+msgid "Accelerator Size Group"
+msgstr "Kürzel-Größen-Gruppe"
+
+# Der Bereich im Shortcut-Fenster, der die Namen der Kürzel anzeigt (im Vergleich zum Bereich, in dem die Kürzel selbst stehen).
+#: src/shortcuts/dzl-shortcuts-group.c:345
+#: src/shortcuts/dzl-shortcuts-group.c:346
+msgid "Title Size Group"
+msgstr "Titel-Größen-Gruppe"
+
+#: src/shortcuts/dzl-shortcuts-group.c:358
+msgid "Height"
+msgstr "Höhe"
+
+#: src/shortcuts/dzl-shortcuts-section.c:338
+#: src/shortcuts/dzl-shortcuts-window.c:784
+msgid "Section Name"
+msgstr "Abschnittsname"
+
+#: src/shortcuts/dzl-shortcuts-section.c:352
+#: src/shortcuts/dzl-shortcuts-window.c:799
+msgid "View Name"
+msgstr "Ansichtsname"
+
+#: src/shortcuts/dzl-shortcuts-section.c:377
+msgid "Maximum Height"
+msgstr "Maximale Höhe"
+
+#: src/shortcuts/dzl-shortcuts-section.c:384
+msgid "change-current-page"
+msgstr "aktuelle-seite-ändern"
+
+#: src/shortcuts/dzl-shortcuts-section.c:437
+msgid "_Show All"
+msgstr "_Alle anzeigen"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:135
+msgid "Two finger pinch"
+msgstr "Zweifinger-Stauchen"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:139
+msgid "Two finger stretch"
+msgstr "Zweifinger-Strecken"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:143
+msgid "Rotate clockwise"
+msgstr "Im Uhrzeigersinn drehen"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:147
+msgid "Rotate counterclockwise"
+msgstr "Gegen den Uhrzeigersinn drehen"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:151
+msgid "Two finger swipe left"
+msgstr "Zweifinger-Wischen nach links"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:155
+msgid "Two finger swipe right"
+msgstr "Zweifinger-Wischen nach rechts"
+
+#. *
+#. * DzlShortcutsWindow::close:
+#. *
+#. * The ::close signal is a
+#. * [keybinding signal][GtkBindingSignal]
+#. * which gets emitted when the user uses a keybinding to close
+#. * the window.
+#. *
+#. * The default binding for this signal is the Escape key.
+#.
+#: src/shortcuts/dzl-shortcuts-window.c:815
+msgid "close"
+msgstr "schließen"
+
+#. *
+#. * DzlShortcutsWindow::search:
+#. *
+#. * The ::search signal is a
+#. * [keybinding signal][GtkBindingSignal]
+#. * which gets emitted when the user uses a keybinding to start a search.
+#. *
+#. * The default binding for this signal is Control-F.
+#.
+#: src/shortcuts/dzl-shortcuts-window.c:832
+msgid "search"
+msgstr "suchen"
+
+#: src/shortcuts/dzl-shortcuts-window.c:926
+msgid "Shortcuts"
+msgstr "Tastenkombinationen"
+
+#: src/shortcuts/dzl-shortcuts-window.c:931
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: src/shortcuts/dzl-shortcuts-window.c:985
+msgid "Search Shortcuts"
+msgstr "Nach Tastenkombinationen suchen"
+
+#: src/shortcuts/dzl-shortcuts-window.c:1050
+msgid "No Results Found"
+msgstr "Keine Ergebnisse gefunden"
+
+#: src/shortcuts/dzl-shortcuts-window.c:1057
+msgid "Try a different search"
+msgstr "Versuchen Sie eine andere Suchanfrage"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.c:200
+msgid "Set Shortcut"
+msgstr "Tastenkombination festlegen"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:16
+msgid "Keyboard Shortcuts"
+msgstr "Tastenkombinationen"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:26
+msgid "Filter Shortcuts"
+msgstr "Tastenkombinationen filtern"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:53
+msgid "Action"
+msgstr "Aktion"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:66
+msgid "Shortcut"
+msgstr "Tastenkombination"
+
+#: src/util/dzl-date-time.c:66
+msgid "Just now"
+msgstr "Gerade eben"
+
+#: src/util/dzl-date-time.c:68
+msgid "An hour ago"
+msgstr "Vor einer Stunde"
+
+#: src/util/dzl-date-time.c:70
+msgid "Yesterday"
+msgstr "Gestern"
+
+#: src/util/dzl-date-time.c:76
+msgid "About a year ago"
+msgstr "Etwa vor einem Jahr"
+
+#: src/util/dzl-date-time.c:80
+#, c-format
+msgid "About %u year ago"
+msgid_plural "About %u years ago"
+msgstr[0] "Etwa vor %u Jahr"
+msgstr[1] "Etwa vor %u Jahren"
+
+#: src/util/dzl-file-manager.c:89
+msgid "File path is NULL"
+msgstr "Dateipfad ist NULL"
+
+#: src/util/dzl-file-manager.c:98 src/util/dzl-file-manager.c:109
+msgid "Error converting UTF-8 filename to wide char"
+msgstr ""
+"Der Dateiname konnte nicht von UTF-8 in Breitzeichen umgewandelt werden"
+
+#: src/util/dzl-file-manager.c:117
+msgid "ILCreateFromPath() failed"
+msgstr "ILCreateFromPath() fehlgeschlagen"
+
+#: src/util/dzl-file-manager.c:154
+#, c-format
+msgid "Cannot convert “%s” into a valid NSURL."
+msgstr "»%s« konnte nicht in eine gültige NSURL umgewandelt werden."
+
+#: src/widgets/dzl-counters-window.ui:14
+msgid "Category"
+msgstr "Kategorie"
+
+#: src/widgets/dzl-counters-window.ui:26
+msgid "Name"
+msgstr "Name"
+
+#: src/widgets/dzl-counters-window.ui:38
+msgid "Value"
+msgstr "Wert"
+
+#: src/widgets/dzl-counters-window.ui:49
+msgid "Description"
+msgstr "Beschreibung"
+
+#: src/widgets/dzl-file-chooser-entry.c:105
+#: src/widgets/dzl-file-chooser-entry.c:169
+msgid "Open"
+msgstr "Öffnen"
+
+#: src/widgets/dzl-file-chooser-entry.c:109
+msgid "Select"
+msgstr "Auswählen"
+
+#: src/widgets/dzl-file-chooser-entry.c:113
+msgid "Create"
+msgstr "Erstellen"
+
+#: src/widgets/dzl-file-chooser-entry.c:117
+msgid "Save"
+msgstr "Speichern"
+
+#: src/widgets/dzl-file-chooser-entry.c:473
+msgid "Browse…"
+msgstr "Durchsuchen …"
+
+#: src/widgets/dzl-search-bar.c:380
+msgid "Search"
+msgstr "Suche"
+
+#: src/widgets/dzl-stack-list.c:417 src/widgets/dzl-stack-list.c:418
+msgid "Model"
+msgstr "Modell"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
+# Chinese (China) translation for libdazzle.
+# Copyright (C) 2021 libdazzle's COPYRIGHT HOLDER
+# This file is distributed under the same license as the libdazzle package.
+# Silence Zhou <silence_zhou@126.com>, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libdazzle master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libdazzle/issues\n"
+"POT-Creation-Date: 2021-06-30 15:20+0000\n"
+"PO-Revision-Date: 2021-08-28 17:12-0400\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.0\n"
+
+#: src/animation/dzl-animation.c:752
+#, c-format
+msgid "Cannot locate property %s in class %s"
+msgstr "在类 %2$s 中无法定位属性 %1$s"
+
+#: src/animation/dzl-animation.c:1099 src/animation/dzl-animation.c:1105
+#, c-format
+msgid "Failed to find property %s in %s"
+msgstr "在 %2$s 中找不到属性 %1$s"
+
+#: src/animation/dzl-animation.c:1113
+#, c-format
+msgid "Failed to find property %s in %s or parent %s"
+msgstr "在类 %2$s 或父类 %3$s 中找不到属性 %1$s"
+
+#: src/animation/dzl-animation.c:1123
+#, c-format
+msgid "Failed to retrieve va_list value: %s"
+msgstr "va_list 值检索失败: %s"
+
+#: src/files/dzl-directory-model.c:377
+msgid "Directory"
+msgstr "目录"
+
+#: src/files/dzl-directory-model.c:378
+msgid "The directory to list files from."
+msgstr "要从中列出文件的目录。"
+
+#: src/prefs/dzl-preferences-font-button.ui:57
+msgid "_Select"
+msgstr "选择(_S)"
+
+#: src/prefs/dzl-preferences-view.ui:15
+msgid "Search Preferences"
+msgstr "搜索偏好"
+
+#: src/search/dzl-trie.c:782
+#, c-format
+msgid "Traversal order %u is not supported on DzlTrie."
+msgstr "DzlTrie 不支持遍历顺序 %u。"
+
+#: src/shortcuts/dzl-shortcut-accel-dialog.c:446
+#: src/widgets/dzl-file-chooser-entry.c:168
+msgid "Cancel"
+msgstr "取消"
+
+#: src/shortcuts/dzl-shortcut-accel-dialog.c:447
+msgid "Set"
+msgstr "设置"
+
+#. Translators: <b>%s</b> is used to show the provided text in bold
+#: src/shortcuts/dzl-shortcut-accel-dialog.c:504
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "输入新的快捷方式更改<b>%s</b>。"
+
+#: src/shortcuts/dzl-shortcut-accel-dialog.ui:43
+msgid "Press Escape to cancel or Backspace to disable."
+msgstr "按 Escape 取消，或按 Backspace 禁用。"
+
+#: src/shortcuts/dzl-shortcut-manager.c:219
+msgid "Default Shortcuts"
+msgstr "默认快捷键"
+
+#: src/shortcuts/dzl-shortcuts-group.c:304
+#: src/shortcuts/dzl-shortcuts-section.c:364
+msgid "Title"
+msgstr "标题"
+
+#: src/shortcuts/dzl-shortcuts-group.c:318
+msgid "View"
+msgstr "视图"
+
+#: src/shortcuts/dzl-shortcuts-group.c:331
+#: src/shortcuts/dzl-shortcuts-group.c:332
+msgid "Accelerator Size Group"
+msgstr ""
+
+#: src/shortcuts/dzl-shortcuts-group.c:345
+#: src/shortcuts/dzl-shortcuts-group.c:346
+msgid "Title Size Group"
+msgstr ""
+
+#: src/shortcuts/dzl-shortcuts-group.c:358
+msgid "Height"
+msgstr "高度"
+
+#: src/shortcuts/dzl-shortcuts-section.c:338
+#: src/shortcuts/dzl-shortcuts-window.c:784
+msgid "Section Name"
+msgstr ""
+
+#: src/shortcuts/dzl-shortcuts-section.c:352
+#: src/shortcuts/dzl-shortcuts-window.c:799
+msgid "View Name"
+msgstr "视图名称"
+
+#: src/shortcuts/dzl-shortcuts-section.c:377
+msgid "Maximum Height"
+msgstr "最大高度"
+
+#: src/shortcuts/dzl-shortcuts-section.c:384
+msgid "change-current-page"
+msgstr ""
+
+#: src/shortcuts/dzl-shortcuts-section.c:437
+msgid "_Show All"
+msgstr "显示全部(_S)"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:135
+msgid "Two finger pinch"
+msgstr "两个手指捏合"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:139
+msgid "Two finger stretch"
+msgstr "两个手指伸展"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:143
+msgid "Rotate clockwise"
+msgstr "顺时针旋转"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:147
+msgid "Rotate counterclockwise"
+msgstr "逆时针方向旋转"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:151
+msgid "Two finger swipe left"
+msgstr "两根手指向左滑动"
+
+#: src/shortcuts/dzl-shortcuts-shortcut.c:155
+msgid "Two finger swipe right"
+msgstr "两根手指向右滑动"
+
+#. *
+#. * DzlShortcutsWindow::close:
+#. *
+#. * The ::close signal is a
+#. * [keybinding signal][GtkBindingSignal]
+#. * which gets emitted when the user uses a keybinding to close
+#. * the window.
+#. *
+#. * The default binding for this signal is the Escape key.
+#.
+#: src/shortcuts/dzl-shortcuts-window.c:815
+msgid "close"
+msgstr "关闭"
+
+#. *
+#. * DzlShortcutsWindow::search:
+#. *
+#. * The ::search signal is a
+#. * [keybinding signal][GtkBindingSignal]
+#. * which gets emitted when the user uses a keybinding to start a search.
+#. *
+#. * The default binding for this signal is Control-F.
+#.
+#: src/shortcuts/dzl-shortcuts-window.c:832
+msgid "search"
+msgstr "搜索"
+
+#: src/shortcuts/dzl-shortcuts-window.c:926
+msgid "Shortcuts"
+msgstr "快捷键"
+
+#: src/shortcuts/dzl-shortcuts-window.c:931
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: src/shortcuts/dzl-shortcuts-window.c:985
+msgid "Search Shortcuts"
+msgstr "搜索快捷键"
+
+#: src/shortcuts/dzl-shortcuts-window.c:1050
+msgid "No Results Found"
+msgstr "未找到结果"
+
+#: src/shortcuts/dzl-shortcuts-window.c:1057
+msgid "Try a different search"
+msgstr "尝试不同的搜索"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.c:200
+msgid "Set Shortcut"
+msgstr "设置快捷键"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:16
+msgid "Keyboard Shortcuts"
+msgstr "快捷键"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:26
+msgid "Filter Shortcuts"
+msgstr "过滤快捷键"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:53
+msgid "Action"
+msgstr "动作"
+
+#: src/shortcuts/dzl-shortcut-theme-editor.ui:66
+msgid "Shortcut"
+msgstr "快捷键"
+
+#: src/util/dzl-date-time.c:66
+msgid "Just now"
+msgstr "当前"
+
+#: src/util/dzl-date-time.c:68
+msgid "An hour ago"
+msgstr "一小时前"
+
+#: src/util/dzl-date-time.c:70
+msgid "Yesterday"
+msgstr "昨天"
+
+#: src/util/dzl-date-time.c:76
+msgid "About a year ago"
+msgstr "大约一年前"
+
+#: src/util/dzl-date-time.c:80
+#, c-format
+msgid "About %u year ago"
+msgid_plural "About %u years ago"
+msgstr[0] "大约 %u 年前"
+
+#: src/util/dzl-file-manager.c:89
+msgid "File path is NULL"
+msgstr "文件路径为 NULL"
+
+#: src/util/dzl-file-manager.c:98 src/util/dzl-file-manager.c:109
+msgid "Error converting UTF-8 filename to wide char"
+msgstr "将 UTF-8 文件名转换为宽字符时出错"
+
+#: src/util/dzl-file-manager.c:117
+msgid "ILCreateFromPath() failed"
+msgstr "ILCreateFromPath() 失败"
+
+#: src/util/dzl-file-manager.c:154
+#, c-format
+msgid "Cannot convert “%s” into a valid NSURL."
+msgstr "无法将 “%s” 转换为有效的NSURL。"
+
+#: src/widgets/dzl-counters-window.ui:14
+msgid "Category"
+msgstr "分类"
+
+#: src/widgets/dzl-counters-window.ui:26
+msgid "Name"
+msgstr "名称"
+
+#: src/widgets/dzl-counters-window.ui:38
+msgid "Value"
+msgstr "值"
+
+#: src/widgets/dzl-counters-window.ui:49
+msgid "Description"
+msgstr "描述"
+
+#: src/widgets/dzl-file-chooser-entry.c:105
+#: src/widgets/dzl-file-chooser-entry.c:169
+msgid "Open"
+msgstr "打开"
+
+#: src/widgets/dzl-file-chooser-entry.c:109
+msgid "Select"
+msgstr "选择"
+
+#: src/widgets/dzl-file-chooser-entry.c:113
+msgid "Create"
+msgstr "创建"
+
+#: src/widgets/dzl-file-chooser-entry.c:117
+msgid "Save"
+msgstr "保存"
+
+#: src/widgets/dzl-file-chooser-entry.c:473
+msgid "Browse…"
+msgstr "浏览…"
+
+#: src/widgets/dzl-search-bar.c:380
+msgid "Search"
+msgstr "搜索"
+
+#: src/widgets/dzl-stack-list.c:417 src/widgets/dzl-stack-list.c:418
+msgid "Model"
+msgstr "模式"
--- a/src/cache/dzl-task-cache.c
+++ b/src/cache/dzl-task-cache.c
@@ -718,8 +718,6 @@ dzl_task_cache_constructed (GObject *object)

  if ((self->key_equal_func == NULL) ||
      (self->key_hash_func == NULL) ||
-      (self->value_copy_func == NULL) ||
-      (self->value_destroy_func == NULL) ||
      (self->populate_callback == NULL))
    {
      g_error ("DzlTaskCache was configured improperly.");
@@ -732,6 +730,12 @@ dzl_task_cache_constructed (GObject *object)
  if (self->key_destroy_func == NULL)
    self->key_destroy_func = dzl_task_cache_dummy_destroy_func;

+  if (self->value_copy_func == NULL)
+    self->value_copy_func = dzl_task_cache_dummy_copy_func;
+
+  if (self->value_destroy_func == NULL)
+    self->value_destroy_func = dzl_task_cache_dummy_destroy_func;
+
  /*
   * This is where the cached result objects live.
   */

--- a/src/dazzle.h
+++ b/src/dazzle.h
@@ -133,7 +133,9 @@ G_BEGIN_DECLS
 #include "tree/dzl-tree-types.h"
 #include "util/dzl-cairo.h"
 #include "util/dzl-cancellable.h"
-#include "util/dzl-counter.h"
+#ifndef G_OS_WIN32
+# include "util/dzl-counter.h"
+#endif
 #include "util/dzl-date-time.h"
 #include "util/dzl-dnd.h"
 #include "util/dzl-file-manager.h"
@@ -153,7 +155,9 @@ G_BEGIN_DECLS
 #include "widgets/dzl-box.h"
 #include "widgets/dzl-centering-bin.h"
 #include "widgets/dzl-column-layout.h"
-#include "widgets/dzl-counters-window.h"
+#ifndef G_OS_WIN32
+# include "widgets/dzl-counters-window.h"
+#endif
 #include "widgets/dzl-elastic-bin.h"
 #include "widgets/dzl-empty-state.h"
 #include "widgets/dzl-entry-box.h"

--- a/src/graphing/dzl-cpu-model.c
+++ b/src/graphing/dzl-cpu-model.c
@@ -21,7 +21,9 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <unistd.h>
+#ifdef __linux__
+# include <unistd.h>
+#endif
 #include <stdio.h>
 #if defined(__FreeBSD__)
 # include <errno.h>

--- a/src/graphing/dzl-graph-line-renderer.c
+++ b/src/graphing/dzl-graph-line-renderer.c
@@ -19,6 +19,7 @@
 #include "config.h"

 #include <glib/gi18n.h>
+#define _USE_MATH_DEFINES
 #include <math.h>

 #include "dzl-graph-line-renderer.h"

--- a/src/meson.build
+++ b/src/meson.build
@@ -97,6 +97,10 @@ if get_option('enable_rdtscp')
  libdazzle_args += '-DDZL_HAVE_RDTSCP'
 endif

+if host_machine.system() == 'darwin'
+  libdazzle_args += '-xobjective-c'
+endif
+
 libdazzle = shared_library(
  'dazzle-' + apiversion,
  libdazzle_sources,
@@ -106,7 +110,6 @@ libdazzle = shared_library(
         dependencies: libdazzle_deps,
  include_directories: [ root_inc, src_inc ],
              install: true,
-          install_dir: libdir
 )

 libdazzle_dep = declare_dependency(

--- a/src/panel/dzl-dock-paned.c
+++ b/src/panel/dzl-dock-paned.c
@@ -27,7 +27,7 @@

 typedef struct
 {
-  GtkPositionType child_edge : 2;
+  GtkPositionType child_edge;
 } DzlDockPanedPrivate;

 G_DEFINE_TYPE_EXTENDED (DzlDockPaned, dzl_dock_paned, DZL_TYPE_MULTI_PANED, 0,

--- a/src/panel/dzl-dock-stack.c
+++ b/src/panel/dzl-dock-stack.c
@@ -32,8 +32,8 @@ typedef struct
  GtkStack         *stack;
  DzlTabStrip      *tab_strip;
  GtkButton        *pinned_button;
-  GtkPositionType   edge : 2;
-  DzlTabStyle       style : 2;
+  GtkPositionType   edge;
+  DzlTabStyle       style;
 } DzlDockStackPrivate;

 static void dzl_dock_stack_init_dock_item_iface (DzlDockItemInterface *iface);

--- a/src/panel/dzl-dock-widget.c
+++ b/src/panel/dzl-dock-widget.c
@@ -254,7 +254,6 @@ static void
 dzl_dock_widget_init (DzlDockWidget *self)
 {
  gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
-  gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
 }

 GtkWidget *

--- a/src/panel/dzl-tab-strip.c
+++ b/src/panel/dzl-tab-strip.c
@@ -32,8 +32,8 @@ typedef struct
 {
  GAction         *action;
  GtkStack        *stack;
-  GtkPositionType  edge : 2;
-  DzlTabStyle      style : 2;
+  GtkPositionType  edge;
+  DzlTabStyle      style;
 } DzlTabStripPrivate;

 static void buildable_iface_init (GtkBuildableIface *iface);
@@ -771,7 +771,7 @@ apply_style (GtkWidget *widget,
    dzl_tab_set_style (DZL_TAB (widget), style);
 }

-guint
+DzlTabStyle
 dzl_tab_strip_get_style (DzlTabStrip *self)
 {
  DzlTabStripPrivate *priv = dzl_tab_strip_get_instance_private (self);

--- a/src/panel/dzl-tab.c
+++ b/src/panel/dzl-tab.c
@@ -30,12 +30,6 @@ struct _DzlTab { GtkEventBox parent; };

 typedef struct
 {
-  /*
-   * The edge the tab is being displayed upon. We use this to rotate
-   * text or alter box orientation.
-   */
-  GtkPositionType edge : 2;
-
  /* Can we be closed by the user */
  guint can_close : 1;

@@ -51,8 +45,14 @@ typedef struct
  /* If we are currently activating */
  guint in_activate : 1;

+  /*
+   * The edge the tab is being displayed upon. We use this to rotate
+   * text or alter box orientation.
+   */
+  GtkPositionType edge;
+
  /* Our icon/text style */
-  DzlTabStyle style : 2;
+  DzlTabStyle style;

  /* The action name to change the current tab */
  gchar *action_name;

--- a/src/util/dzl-counter.c
+++ b/src/util/dzl-counter.c
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#ifndef G_OS_WIN32
 #include <unistd.h>
+#endif

 #ifdef G_OS_UNIX
 # include <sys/mman.h>
@@ -148,6 +150,7 @@ dzl_counter_reset (DzlCounter *counter)
  DZL_MEMORY_BARRIER;
 }

+#ifndef G_OS_WIN32
 static void
 _dzl_counter_arena_atexit (void)
 {
@@ -158,6 +161,7 @@ _dzl_counter_arena_atexit (void)
  g_snprintf (name, sizeof name, NAME_FORMAT, pid);
  shm_unlink (name);
 }
+#endif

 static void
 _dzl_counter_arena_init_local (DzlCounterArena *arena)
@@ -418,7 +422,7 @@ _dzl_counter_arena_destroy (DzlCounterArena *arena)
  g_assert (arena != NULL);

  if (arena->data_is_mmapped)
-    munmap (arena->cells, arena->data_length);
+    munmap ((void *)arena->cells, arena->data_length);
  else
 #ifdef G_OS_WIN32
    /* Allocated with _aligned_malloc() */

--- a/src/util/dzl-pango.c
+++ b/src/util/dzl-pango.c
@@ -22,6 +22,7 @@

 #include <gdk/gdk.h>
 #include <glib/gstdio.h>
+#define _USE_MATH_DEFINES
 #include <math.h>

 #include "util/dzl-pango.h"

--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -36,6 +36,7 @@ util_sources = [
 ]

 # No counters if building on win32 for now.
+# When avaiable remove G_OS_WIN32 checks in src/dazzel.h.
 # They need explicit porting to that platform and should
 # probably just wrap the eventtrace API or something.
 if host_machine.system() != 'windows'

--- a/src/widgets/dzl-column-layout.c
+++ b/src/widgets/dzl-column-layout.c
@@ -18,6 +18,7 @@

 #include "config.h"

+#define _USE_MATH_DEFINES
 #include <math.h>

 #define G_LOG_DOMAIN "dzl-column-layout"

--- a/src/widgets/dzl-progress-icon.c
+++ b/src/widgets/dzl-progress-icon.c
@@ -21,6 +21,7 @@

 #include "config.h"

+#define _USE_MATH_DEFINES
 #include <math.h>

 #include "dzl-progress-icon.h"