nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into oasis

Browse Source 
# Conflicts:
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js
#	public/chunks/app-language.js
#	public/chunks/app-settings.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/dashboard.js
#	public/chunks/database.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/homepage.js
#	public/chunks/installation-disclaimer.js
#	public/chunks/invoices.js
#	public/chunks/page-edit.js
#	public/chunks/pages.js
#	public/chunks/plan-create.js
#	public/chunks/plan-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plan.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/profile~chunks/settings-password.js
#	public/chunks/purchase-code.js
#	public/chunks/settings-create-payment-methods.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-storage.js
#	public/chunks/settings-subscription.js
#	public/chunks/settings.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/stripe-credentials.js
#	public/chunks/subscription-plans.js
#	public/chunks/subscription-service.js
#	public/chunks/upgrade-billing.js
#	public/chunks/upgrade-plan.js
#	public/chunks/user-create.js
#	public/chunks/user-delete.js
#	public/chunks/user-detail.js
#	public/chunks/user-invoices.js
#	public/chunks/user-storage.js
#	public/chunks/user-subscription.js
#	public/chunks/user.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	public/vendors~chunks/platform~chunks/shared.js
This commit is contained in:
Peter Papp
2021-04-20 08:15:34 +02:00
parent edafa1791b 25a28c37c8
commit 80019b822d
154 changed files with 5332 additions and 4857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/language-translations.php
View File

@@ -90,8 +90,6 @@ return [
"admin_settings.tabs.payments" => "Payments",
"global.monthly_ac" => "Mo.",
"global.premium" => "Premium",
"global.saas" => "Services",
"global.subscription" => "Subscription",
"global.upgrade_plan" => "Upgrade Plan",
"incomplete_payment.description" => "Your latest payment is incomplete. {0}",
"incomplete_payment.href" => "Please confirm your payment.",
@@ -380,7 +378,6 @@ return [
"global.free" => "Free",
"global.get_it" => "Get It",
"global.incomplete" => "Incomplete",
"global.menu" => "Menu",
"global.or" => "or",
"global.total" => "Total",
"input_image.supported" => "Supported formats are .png, .jpg, .jpeg.",
@@ -540,9 +537,7 @@ return [
"routes_title.page_edit" => "Edit Page",
"routes_title.pages" => "Pages",
"routes_title.profile" => "My Profile",
"routes_title.profile_settings" => "Profile Settings",
"routes_title.settings" => "Settings",
"routes_title.settings_mobile" => "Settings",
"routes_title.settings_password" => "Change Password",
"routes_title.settings_storage" => "Storage",
"routes_title.user_create" => "Create User",
@@ -677,5 +672,6 @@ return [
'og_image_description' => 'Image that appear when someone shares the content to Facebook or any other social medium. Preferred size is 1200x627',
'app_touch_icon' => 'App Touch Icon',
'app_touch_icon_description' => 'If user store bookmark on his phone screen, this icon appear in app thumbnail. Preferred size is 156x156',
'select_search_placeholder' => 'Search in list...',
]
];