Merge remote-tracking branch 'origin/bulk-operations'

# Conflicts:
#	app/Http/Helpers/helpers.php
#	config/vuefilemanager.php
#	public/chunks/app-others.js
#	public/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemList.vue
#	resources/js/components/FilesView/FilePreview.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js
This commit is contained in:
Peter Papp
2020-12-21 17:02:49 +01:00
167 changed files with 6839 additions and 3151 deletions
+40 -15
View File
@@ -5,7 +5,10 @@
"move": "Move item",
"preview": "更改预览",
"share": "Share item",
"upload": "上传文件"
"upload": "上传文件",
"close": "Close",
"sorting_view": "Sorting and View",
"info_panel": "Info panel"
},
"activation": {
"stripe": {
@@ -258,6 +261,7 @@
},
"alerts": {
"error_confirm": "哦,出了个问题!",
"leave_to_sign_in": "Do you really want to leave?",
"success_confirm": "太棒了!"
},
"context_menu": {
@@ -275,8 +279,23 @@
"rename": "重命名",
"restore": "恢复文件",
"share": "分享",
"share_cancel": "Cancel Sharing",
"share_edit": "编辑分享设定",
"upload": "上传"
"upload": "上传",
"select": "Select",
"no_options": "No Options Available"
},
"mobile_selecting": {
"select_all": "Select All",
"deselect_all": "Deselect All",
"done": "Done"
},
"preview_sorting": {
"grid_view": "Grid View",
"list_view": "List View",
"sort_date": "Sort By Date",
"sort_alphabet": "Sort By Aplhabet",
"preview_sorting_button": "View"
},
"cookie_disclaimer": {
"button": "cookies policy",
@@ -299,7 +318,9 @@
"created_at": "创建于",
"shared": "分享",
"size": "大小",
"where": "地址"
"where": "地址",
"selected_multiple": "Selected Multiple Items",
"items": "Items"
},
"file_detail_meta": {
"dimension": "Dimensions",
@@ -356,7 +377,10 @@
"locations": {
"home": "首页",
"shared": "已分享",
"trash": "垃圾箱"
"trash": "垃圾箱",
"profile": "Profile",
"settings": "Settings",
"logout": "Log Out"
},
"menu": {
"admin": "Admin",
@@ -505,9 +529,15 @@
"title": "You are trying to upload unsupported file type",
"message": "File of this type ({mimetype}) is not allowed to upload."
},
"popup_zipping": {
"title": "Zipping Your Files...",
"message": "Please wait until your files start downloading."
},
"popup_create_folder": {
"folder_default_name": "新文件夹",
"title": "请填入新文件夹名称"
"folder_default_name": "New Folder",
"title": "Create Folder",
"label": "Type Name",
"placeholder": "Type your name"
},
"popup_delete_card": {
"message": "此事件不可逆转,您的付款卡将被永久删除",
@@ -551,7 +581,9 @@
"title": "File is too large"
},
"popup_rename": {
"title": "修改文件/夹名称"
"title": "Rename Your {item}",
"label": "Edit Name",
"placeholder": "Type your title"
},
"popup_set_card": {
"message": "您的卡将被设置为默认卡,并且在以后的结算中始终会收取费用。",
@@ -581,14 +613,6 @@
"message": "您的订阅已重新激活,并且将按原始计费周期计费。",
"title": "订阅已取消"
},
"popup_trashed": {
"message": "现在,您的垃圾箱已经被完全清空。",
"title": "您的垃圾箱已清空!"
},
"preview_type": {
"grid": "方块",
"list": "列表"
},
"profile": {
"change_pass": "修改您的密码",
"profile_info": "用户信息",
@@ -720,6 +744,7 @@
"href": "Please confirm your payment."
},
"uploading": {
"cancel": "Cancel Uploading",
"processing_file": "Processing File...",
"progress_single_upload": "上传文件 {progress}%",
"progress": "上传文件 {progress}% - {current}/{total}"
+44 -19
View File
@@ -7,7 +7,10 @@
"share": "Share item",
"upload": "Upload file",
"download": "Download item",
"print": "Print item"
"print": "Print item",
"close": "Close",
"sorting_view": "Sorting and View",
"info_panel": "Info panel"
},
"activation": {
"stripe": {
@@ -260,6 +263,7 @@
},
"alerts": {
"error_confirm": "Thats horrible!",
"leave_to_sign_in": "Do you really want to leave?",
"success_confirm": "Awesome!"
},
"context_menu": {
@@ -277,8 +281,23 @@
"rename": "Rename",
"restore": "Restore",
"share": "Share",
"share_cancel": "Cancel Sharing",
"share_edit": "Edit Sharing",
"upload": "Upload"
"upload": "Upload",
"select": "Select",
"no_options": "No Options Available"
},
"mobile_selecting": {
"select_all": "Select All",
"deselect_all": "Deselect All",
"done": "Done"
},
"preview_sorting": {
"grid_view": "Grid View",
"list_view": "List View",
"sort_date": "Sort By Date",
"sort_alphabet": "Sort By Aplhabet",
"preview_sorting_button": "View"
},
"cookie_disclaimer": {
"button": "cookies policy",
@@ -301,7 +320,9 @@
"created_at": "Created at",
"shared": "Shared",
"size": "Size",
"where": "Where"
"where": "Where",
"selected_multiple": "Selected Multiple Items",
"items": "Items"
},
"file_detail_meta": {
"dimension": "Dimensions",
@@ -356,9 +377,12 @@
"original_location": "Original Location"
},
"locations": {
"home": "Home",
"home": "Files",
"shared": "Shared",
"trash": "Trash"
"trash": "Trash",
"profile": "Profile",
"settings": "Settings",
"logout": "Log Out"
},
"menu": {
"admin": "Administration",
@@ -507,10 +531,6 @@
"title": "You are trying to upload unsupported file type",
"message": "File of this type ({mimetype}) is not allowed to upload."
},
"popup_create_folder": {
"folder_default_name": "New Folder",
"title": "Please enter your new folder name"
},
"popup_delete_card": {
"message": "This event is irreversible and your payment card will be delete forever",
"title": "Are you sure?"
@@ -552,8 +572,20 @@
"message": "Sorry, your file is too large and can't be uploaded",
"title": "File is too large"
},
"popup_zipping": {
"title": "Zipping Your Files...",
"message": "Please wait until your files start downloading."
},
"popup_rename": {
"title": "Change your item name"
"title": "Rename Your {item}",
"label": "Edit Name",
"placeholder": "Type your title"
},
"popup_create_folder": {
"folder_default_name": "New Folder",
"title": "Create Folder",
"label": "Type Name",
"placeholder": "Type your name"
},
"popup_set_card": {
"message": "Your card will be set as default and will be always charged for the next billings.",
@@ -583,14 +615,6 @@
"message": "Your subscription was re-activated, and they will be billed on the original billing cycle.",
"title": "Subscription Was Resumed"
},
"popup_trashed": {
"message": "So now, you have clear and empty trash.",
"title": "Your trash was erased!"
},
"preview_type": {
"grid": "Grid",
"list": "List"
},
"profile": {
"change_pass": "Change Password",
"profile_info": "Profile Information",
@@ -676,7 +700,7 @@
"favourites": "Favourites",
"favourites_empty": "Drag here your favourite folder.",
"folders_empty": "Create some new folder.",
"home": "Home",
"home": "Files",
"latest": "Recent Uploads",
"locations_title": "Base",
"my_shared": "My Shared Items",
@@ -722,6 +746,7 @@
"href": "Please confirm your payment."
},
"uploading": {
"cancel": "Cancel Uploading",
"processing_file": "Processing File...",
"progress_single_upload": "Uploading File {progress}%",
"progress": "Uploading File {progress}% - {current}/{total}"
+39 -14
View File
@@ -7,7 +7,10 @@
"share": "Zdieľať položku",
"upload": "Nahrať súbory",
"download": "Stiahnuť položku",
"print": "Vytlačiť položku"
"print": "Vytlačiť položku",
"close": "Zatvoriť",
"sorting_view" : "Zoradenie a zobrazenie ",
"info_panel" : "Informačný panel"
},
"activation": {
"stripe": {
@@ -260,6 +263,7 @@
},
"alerts": {
"error_confirm": "To je hrozné!",
"leave_to_sign_in": "Naozaj chcete odísť?",
"success_confirm": "Skvelé!"
},
"context_menu": {
@@ -277,8 +281,23 @@
"rename": "Premenovať",
"restore": "Obnoviť",
"share": "Zdieľať",
"share_cancel": "Zrušenie zdieľania",
"share_edit": "Upraviť zdieľanie",
"upload": "Nahrať"
"upload": "Nahrať",
"select": "Výber",
"no_options": "Nie sú k dispozícii žiadne možnosti"
},
"mobile_selecting": {
"select_all": "Vybrať všetko",
"deselect_all": "Odznačiť všetko",
"done": "Hotovo"
},
"preview_sorting": {
"grid_view": "Mriežka",
"list_view": "List",
"sort_date": "Zoradiť podľa dátumu",
"sort_alphabet": "Zoradiť podľa náyvu",
"preview_sorting_button": "Zobrazenie"
},
"cookie_disclaimer": {
"button": "politikou cookies",
@@ -301,7 +320,9 @@
"created_at": "Vytvorené",
"shared": "Zdieľané",
"size": "Veľkosť",
"where": "Umiestnenie"
"where": "Umiestnenie",
"selected_multiple": "Vybratých viac položiek",
"items": "{count} Položky | {count} Položiek"
},
"file_detail_meta": {
"dimension": "Dimenzie",
@@ -358,7 +379,10 @@
"locations": {
"home": "Domov",
"shared": "Zdieľané",
"trash": "Kôš"
"trash": "Kôš",
"profile": "Profil",
"settings": "Nastavenia",
"logout": "Odhlásiť sa"
},
"menu": {
"admin": "Administrácia",
@@ -507,9 +531,15 @@
"title": "Ospravedlňujeme sa",
"message": "Nieje povolené nahrávať tento typ súboru ({mimetype})."
},
"popup_zipping": {
"title": "Súbory sa zipujú...",
"message": "Čakajte prosím, kým súbory sa nezačnú sťahovať."
},
"popup_create_folder": {
"folder_default_name": "Nový priečinok",
"title": "Prosím, vložte názov nového priečinka"
"title": "Vytvoriť priečinok",
"label": "Napíš meno",
"placeholder": "Prosím, vložte názov nového priečinka"
},
"popup_delete_card": {
"message": "Táto udalosť je nezvratná a vaša platobná karta bude navždy odstránená",
@@ -553,7 +583,9 @@
"title": "Súbor je príliš veľký"
},
"popup_rename": {
"title": "Zmeňte názov položky"
"title": "Zmeňte názov {item}",
"label": "Zmeniť názov",
"placeholder": "Napíš názov..."
},
"popup_set_card": {
"message": "Vaša karta bude nastavená ako predvolená a bude vám z nej vždy stiahnutá čiastka za nasledujúce obdobie fakturácie.",
@@ -583,14 +615,6 @@
"message": "Váš odber bol znova aktivovaný a budú vám účtované poplatky podľa pôvodného fakturačného cyklu.",
"title": "Predplatné bolo obnovené"
},
"popup_trashed": {
"message": "Od teraz máte prázdny a čistý kôš",
"title": "Váš kôš bol vymazaný!"
},
"preview_type": {
"grid": "Mriežka",
"list": "List"
},
"profile": {
"change_pass": "Zmeniť heslo",
"profile_info": "Profil",
@@ -722,6 +746,7 @@
"href": "Prosím potvrďte Vašu platbu."
},
"uploading": {
"cancel": "Zrušiť nahrávanie",
"processing_file": "Spracuvávam súbor...",
"progress_single_upload": "Nahrávam súbor {progress}%",
"progress": "Nahrávam súbory {progress}% - {current}/{total}"