nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/docs-update' into 'mainline'

Browse source 
Docs update

See merge request GNOME/geary!367
This commit is contained in:
Michael Gratton 2019-11-18 11:23:10 +00:00
commit 93d1ab684b
7 changed files with 219 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ui/composer-headerbar.ui
View file

@ -16,7 +16,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Detach (Ctrl+D)</property>
<property name="tooltip_text" translatable="yes">Detach the composer from the window</property>
<property name="margin_end">6</property>
<property name="action_name">cmh.detach</property>
<property name="relief">none</property>
@ -56,7 +56,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Attach File (Ctrl+T)</property>
<property name="tooltip_text" translatable="yes">Attach a file</property>
<property name="action_name">cmh.add-attachment</property>
<property name="always_show_image">True</property>
<child>
@ -81,7 +81,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Attach File (Ctrl+T)</property>
<property name="tooltip_text" translatable="yes">Attach a file</property>
<property name="action_name">cmh.add-attachment</property>
<property name="always_show_image">True</property>
<child>
@ -105,7 +105,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Include Original Attachments</property>
<property name="tooltip_text" translatable="yes">Add original attachments</property>
<property name="action_name">cmh.add-original-attachments</property>
<property name="always_show_image">True</property>
<child>
@ -173,7 +173,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Detach (Ctrl+D)</property>
<property name="tooltip_text" translatable="yes">Detach the composer from the window</property>
<property name="margin_start">6</property>
<property name="action_name">cmh.detach</property>
<property name="relief">none</property>
@ -206,7 +206,6 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Send (Ctrl+Enter)</property>
<property name="action_name">cmh.send</property>
<property name="use_underline">True</property>
<property name="always_show_image">True</property>

29
ui/composer-widget.ui
View file

@ -350,7 +350,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Undo last edit (Ctrl+Z)</property>
<property name="tooltip_text" translatable="yes">Undo last edit</property>
<property name="action_name">edt.undo</property>
<property name="always_show_image">True</property>
<child>
@ -374,7 +374,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Redo last edit (Ctrl+Shift+Z)</property>
<property name="tooltip_text" translatable="yes">Redo last edit</property>
<property name="action_name">edt.redo</property>
<property name="always_show_image">True</property>
<child>
@ -412,7 +412,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Bold (Ctrl+B)</property>
<property name="tooltip_text" translatable="yes">Bold text</property>
<property name="action_name">edt.bold</property>
<property name="always_show_image">True</property>
<child>
@ -436,7 +436,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Italic (Ctrl+I)</property>
<property name="tooltip_text" translatable="yes">Italic text</property>
<property name="action_name">edt.italic</property>
<property name="always_show_image">True</property>
<child>
@ -460,7 +460,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Underline (Ctrl+U)</property>
<property name="tooltip_text" translatable="yes">Underline text</property>
<property name="action_name">edt.underline</property>
<property name="always_show_image">True</property>
<child>
@ -484,7 +484,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Strikethrough (Ctrl+K)</property>
<property name="tooltip_text" translatable="yes">Strikethrough text</property>
<property name="action_name">edt.strikethrough</property>
<property name="always_show_image">True</property>
<child>
@ -522,7 +522,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Insert unordered list</property>
<property name="tooltip_text" translatable="yes">Insert bulleted list</property>
<property name="action_name">edt.ulist</property>
<property name="always_show_image">True</property>
<child>
@ -546,7 +546,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Insert ordered list</property>
<property name="tooltip_text" translatable="yes">Insert numbered list</property>
<property name="action_name">edt.olist</property>
<property name="always_show_image">True</property>
<child>
@ -584,7 +584,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Quote text (Ctrl+])</property>
<property name="tooltip_text" translatable="yes">Indent or quote text</property>
<property name="action_name">edt.indent</property>
<property name="always_show_image">True</property>
<child>
@ -608,7 +608,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Unquote text (Ctrl+[)</property>
<property name="tooltip_text" translatable="yes">Un-indent or unquote text</property>
<property name="action_name">edt.outdent</property>
<property name="always_show_image">True</property>
<child>
@ -646,7 +646,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Insert or update selection link (Ctrl+L)</property>
<property name="tooltip_text" translatable="yes">Insert or update text link</property>
<property name="action_name">edt.insert-link</property>
<property name="always_show_image">True</property>
<child>
@ -670,7 +670,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Insert an image (Ctrl+G)</property>
<property name="tooltip_text" translatable="yes">Insert an image</property>
<property name="action_name">edt.insert-image</property>
<property name="always_show_image">True</property>
<child>
@ -704,7 +704,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Remove selection formatting (Ctrl+Space)</property>
<property name="tooltip_text" translatable="yes">Remove text formatting</property>
<property name="action_name">edt.remove-format</property>
<property name="always_show_image">True</property>
<child>
@ -868,9 +868,6 @@
<property name="top_attach">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>

9
ui/gtk/help-overlay.ui
View file

@ -203,7 +203,14 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Close current window</property>
<property name="title" translatable="yes" context="shortcut window">Open a new window</property>
<property name="accelerator">&lt;primary&gt;&lt;Shift&gt;N</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Close the current window</property>
<property name="accelerator">&lt;primary&gt;W</property>
</object>
</child>