Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode
# Conflicts: # src/components/guide/guide.js # src/components/mediainfo/mediainfo.js # src/components/multiselect/multiselect.js # src/components/playback/brightnessosd.js # src/components/recordingcreator/recordingbutton.js # src/components/userdatabuttons/emby-ratingbutton.js # src/controllers/favorites.js
This commit is contained in:
commit
080b3365d6
145 changed files with 1438 additions and 4767 deletions
|
@ -88,27 +88,27 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
|
|||
menuItems.push({
|
||||
name: globalize.translate("ButtonEditImages"),
|
||||
id: "editimages",
|
||||
ironIcon: "photo"
|
||||
icon: "photo"
|
||||
});
|
||||
menuItems.push({
|
||||
name: globalize.translate("ManageLibrary"),
|
||||
id: "edit",
|
||||
ironIcon: "folder_open"
|
||||
icon: "folder_open"
|
||||
});
|
||||
menuItems.push({
|
||||
name: globalize.translate("ButtonRemove"),
|
||||
id: "delete",
|
||||
ironIcon: "remove"
|
||||
icon: "delete"
|
||||
});
|
||||
menuItems.push({
|
||||
name: globalize.translate("ButtonRename"),
|
||||
id: "rename",
|
||||
ironIcon: "mode_edit"
|
||||
icon: "mode_edit"
|
||||
});
|
||||
menuItems.push({
|
||||
name: globalize.translate("ScanLibrary"),
|
||||
id: "refresh",
|
||||
ironIcon: "refresh"
|
||||
icon: "refresh"
|
||||
});
|
||||
|
||||
require(["actionsheet"], function (actionsheet) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue