Move button language to $:/language/Buttons

core/language/en-GB/Buttons.multids

@@ -0,0 +1,22 @@
+title: $:/language/Buttons/
+
+AdvancedSearch/Caption: advanced search
+AdvancedSearch/Hint: Advanced search
+Cancel/Caption: cancel
+Cancel/Hint: Cancel editing this tiddler
+Close/Caption: close
+Close/Hint: Close this tiddler
+ControlPanel/Caption: control panel
+ControlPanel/Hint: Open control panel
+Delete/Caption: delete
+Delete/Hint: Delete this tiddler
+Edit/Caption: edit
+Edit/Hint: Edit this tiddler
+Info/Caption: info
+Info/Hint: Show information for this tiddler
+NewTiddler/Caption: new tiddler
+NewTiddler/Hint: Create a new tiddler
+Save/Caption: save
+Save/Hint: Save this tiddler
+SaveWiki/Caption: save changes
+SaveWiki/Hint: Save changes

core/language/en-GB/Toolbars.multids

@@ -1,20 +0,0 @@
-title: $:/language/
-
-EditToolbar/Delete/Caption: delete
-EditToolbar/Delete/Hint: Delete this tiddler
-EditToolbar/Cancel/Caption: cancel
-EditToolbar/Cancel/Hint: Cancel editing this tiddler
-EditToolbar/Save/Caption: save
-EditToolbar/Save/Hint: Save this tiddler
-ViewToolbar/Info/Caption: info
-ViewToolbar/Info/Hint: Show information for this tiddler
-ViewToolbar/Edit/Caption: edit
-ViewToolbar/Edit/Hint: Edit this tiddler
-ViewToolbar/Close/Caption: close
-ViewToolbar/Close/Hint: Close this tiddler
-PageControls/NewTiddler/Caption: new tiddler
-PageControls/NewTiddler/Hint: Create a new tiddler
-PageControls/ControlPanel/Caption: control panel
-PageControls/ControlPanel/Hint: Open control panel
-PageControls/SaveWiki/Caption: save changes
-PageControls/SaveWiki/Hint: Save changes

core/ui/EditToolbar/cancel.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/EditToolbar/cancel
 tags: $:/tags/EditToolbar
 
-<$button message="tw-cancel-tiddler" title={{$:/language/EditToolbar/Cancel/Hint}} aria-label={{$:/language/EditToolbar/Cancel/Caption}} class="btn-invisible">{{$:/core/images/cancel-button}}</$button>
+<$button message="tw-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class="btn-invisible">{{$:/core/images/cancel-button}}</$button>

core/ui/EditToolbar/delete.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/EditToolbar/delete
 tags: $:/tags/EditToolbar
 
-<$button message="tw-delete-tiddler" title={{$:/language/EditToolbar/Delete/Hint}} aria-label={{$:/language/EditToolbar/Delete/Caption}} class="btn-invisible">{{$:/core/images/delete-button}}</$button>
+<$button message="tw-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class="btn-invisible">{{$:/core/images/delete-button}}</$button>

core/ui/EditToolbar/save.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/EditToolbar/save
 tags: $:/tags/EditToolbar
 
-<$button message="tw-save-tiddler" title={{$:/language/EditToolbar/Save/Hint}} aria-label={{$:/language/EditToolbar/Save/Caption}} class="btn-invisible">{{$:/core/images/done-button}}</$button>
+<$button message="tw-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class="btn-invisible">{{$:/core/images/done-button}}</$button>

core/ui/PageControls/controlpanel.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/PageControls/control-panel
 tags: $:/tags/PageControls
 
-<$button to="$:/ControlPanel" title={{$:/language/PageControls/ControlPanel/Hint}} aria-label={{$:/language/PageControls/ControlPanel/Caption}} class="btn-invisible">{{$:/core/images/options-button}}</$button>
+<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class="btn-invisible">{{$:/core/images/options-button}}</$button>

core/ui/PageControls/newtiddler.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/PageControls/new-tiddler
 tags: $:/tags/PageControls
 
-<$button message="tw-new-tiddler" title={{$:/language/PageControls/NewTiddler/Hint}} aria-label={{$:/language/PageControls/NewTiddler/Caption}} class="btn-invisible">{{$:/core/images/new-button}}</$button>
+<$button message="tw-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class="btn-invisible">{{$:/core/images/new-button}}</$button>

core/ui/PageControls/savewiki.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/PageControls/save-wiki
 tags: $:/tags/PageControls
 
-<$button message="tw-save-wiki" title={{$:/language/PageControls/SaveWiki/Hint}} aria-label={{$:/language/PageControls/SaveWiki/Caption}} class="btn-invisible">{{$:/core/images/save-button}}</$button>
+<$button message="tw-save-wiki" title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class="btn-invisible">{{$:/core/images/save-button}}</$button>

core/ui/ViewToolbar/close.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewToolbar/close
 tags: $:/tags/ViewToolbar
 
-<$button message="tw-close-tiddler" title={{$:/language/ViewToolbar/Close/Hint}} aria-label={{$:/language/ViewToolbar/Close/Caption}} class="btn-invisible">{{$:/core/images/close-button}}</$button>
+<$button message="tw-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="btn-invisible">{{$:/core/images/close-button}}</$button>

core/ui/ViewToolbar/edit.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewToolbar/edit
 tags: $:/tags/ViewToolbar
 
-<$button message="tw-edit-tiddler" title={{$:/language/ViewToolbar/Edit/Hint}} aria-label={{$:/language/ViewToolbar/Edit/Caption}} class="btn-invisible">{{$:/core/images/edit-button}}</$button>
+<$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class="btn-invisible">{{$:/core/images/edit-button}}</$button>

core/ui/ViewToolbar/info.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewToolbar/info
 tags: $:/tags/ViewToolbar
 
-<$button popup=<<tiddlerInfoState>> title={{$:/language/ViewToolbar/Info/Hint}} aria-label={{$:/language/ViewToolbar/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}</$button>
+<$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}</$button>