From ade730918e54515cef5fa9279e3ed920957d6e9c Mon Sep 17 00:00:00 2001 From: Victor Tran Date: Sun, 10 Sep 2017 21:02:59 +1000 Subject: [PATCH] Prepare for 7.0 release --- infopanedropdown.cpp | 3 + infopanedropdown.ui | 78 ++- internationalisation.h | 28 +- onboarding.cpp | 14 +- translations/en_US.ts | 1332 ++++++++++++++++++++++------------------ 5 files changed, 841 insertions(+), 614 deletions(-) diff --git a/infopanedropdown.cpp b/infopanedropdown.cpp index bb5bfde..b6f5cad 100644 --- a/infopanedropdown.cpp +++ b/infopanedropdown.cpp @@ -2717,6 +2717,9 @@ void InfoPaneDropdown::on_localeList_currentRowChanged(int currentRow) case Internationalisation::svSE: settings.setValue("locale/language", "sv_SE"); break; + case Internationalisation::ltLT: + settings.setValue("locale/language", "lt_LT"); + break; } QString localeName = settings.value("locale/language", "en_US").toString(); diff --git a/infopanedropdown.ui b/infopanedropdown.ui index 99da438..356835f 100644 --- a/infopanedropdown.ui +++ b/infopanedropdown.ui @@ -590,14 +590,14 @@ 0 1969 9 - 28 + 27 1969 9 - 28 + 27 @@ -2264,7 +2264,79 @@ - + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 15 + + + + Network + + + + + + + + 0 + 0 + + + + Qt::Horizontal + + + + + + + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + + 0 + 0 + + + + + diff --git a/internationalisation.h b/internationalisation.h index de1557f..f67d98a 100644 --- a/internationalisation.h +++ b/internationalisation.h @@ -1,5 +1,5 @@ /**************************************** - * + * * theShell - Desktop Environment * Copyright (C) 2017 Victor Tran * @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * + * * *************************************/ #ifndef INTERNATIONALISATION_H @@ -50,6 +50,7 @@ public: esES, ruRU, svSE, + ltLT, // Unfinished languages follow jaJP, arSA, @@ -101,27 +102,30 @@ public: case svSE: languageBox->addItem(new QListWidgetItem(QIcon::fromTheme("flag-se"), tr("Swedish") + " (Svenska) ")); break; - /*case arSA: - languageBox->addItem("[SA] " + tr("Arabic") + " (العربية) "); + case ltLT: + languageBox->addItem(new QListWidgetItem(QIcon::fromTheme("flag-lt"), tr("Lithuanian") + " (Lietuviškai) ")); + break; + case arSA: + //languageBox->addItem("[SA] " + tr("Arabic") + " (العربية) "); break; case ptBR: - languageBox->addItem("[BR] " + tr("Portuguese") + " (Português) "); + //languageBox->addItem("[BR] " + tr("Portuguese") + " (Português) "); break; case zhCN: - languageBox->addItem("[CN] " + tr("Chinese") + " (中文) "); + //languageBox->addItem("[CN] " + tr("Chinese") + " (中文) "); break; case frFR: - languageBox->addItem("[FR] " + tr("French") + " (Français) "); + //languageBox->addItem("[FR] " + tr("French") + " (Français) "); break; case miNZ: - languageBox->addItem("[NZ] " + tr("Māori") + " (Māori) "); + //languageBox->addItem("[NZ] " + tr("Māori") + " (Māori) "); break; case jaJP: - languageBox->addItem("[JP] " + tr("Japanese") + " (日本語) "); + //languageBox->addItem("[JP] " + tr("Japanese") + " (日本語) "); break; case deDE: - languageBox->addItem("[DE] " + tr("German") + " (Deutsch) "); - break;*/ + //languageBox->addItem("[DE] " + tr("German") + " (Deutsch) "); + break; } } @@ -162,6 +166,8 @@ public: languageBox->setCurrentRow(ruRU); } else if (currentLocale == "sv_SE") { languageBox->setCurrentRow(svSE); + } else if (currentLocale == "lt_LT") { + languageBox->setCurrentRow(ltLT); } //Unblock signals diff --git a/onboarding.cpp b/onboarding.cpp index cedb394..c9954a5 100644 --- a/onboarding.cpp +++ b/onboarding.cpp @@ -36,6 +36,15 @@ "- New Automatically Show Bar option. The bar will not extend unless it is clicked on if this option is not set.\n"\ "- New network manager\n"\ "- Printers removed\n"\ + "- theShell Session Manager is now used to start theShell. If theShell crashes, you'll be able to restart it.\n"\ + "- Added DPI settings. On high DPI monitors, theShell can be scaled up.\n"\ + "- Power Stretch now disables the animation in the Status Center\n"\ + "- Added some accessibility settings.\n"\ + "- Added option to keep screen unlocked after suspend\n"\ + "- Changing any theme settings will now automatically change them in all supported applications.\n"\ + "- New end session screen when pressing power button or CTRL+ALT+DEL\n"\ + "- User Management now sets passwords correctly\n"\ + "- Administrator and standard accounts can now be set in user management\n"\ "\n"\ "New in theShell 6.1:\n"\ "- New Status Bar. Go to Settings > Bar to activate it.\n"\ @@ -73,7 +82,7 @@ "- theWave now uses theCalculator to process calculations.\n" \ "- theShell now uses its own platform abstraction module to theme your system. Change the theming in theShell Settings.\n" \ "- theShell now uses the Contemporary theme to display widgets.\n"\ - "- theShell now displays notifications when it detects a connected device\n" \ + "- theShell now displays notifications when it detects a connected device\n"\ "" extern NativeEventFilter* NativeFilter; @@ -254,6 +263,9 @@ void Onboarding::on_localeList_currentRowChanged(int currentRow) case Internationalisation::svSE: settings.setValue("locale/language", "sv_SE"); break; + case Internationalisation::ltLT: + settings.setValue("locale/language", "lt_LT"); + break; } QString localeName = settings.value("locale/language", "en_US").toString(); diff --git a/translations/en_US.ts b/translations/en_US.ts index 2c698b6..d054b95 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -4,47 +4,47 @@ AppsListModel - + Application - + Place a call over - + Run Command - + Open webpage - + Open Folder - + Open File - + Query theWave - + theWave - + Personal Assistant @@ -52,12 +52,12 @@ AudioManager - + Ignores any notifications from all apps. Normal sounds will still be played, and timers and reminders will still notify you, however, they won't play sounds. - + Completely turns off all sounds and notifications from all apps. Not even timers or reminders will notify you. @@ -65,12 +65,12 @@ BTHandsfree - + In call - + Dialling... @@ -98,12 +98,12 @@ - + For desktop - + For system @@ -137,7 +137,7 @@ - + Select Background @@ -145,33 +145,116 @@ DbusEvents - + Perform Action... - - + + %1 Connected - - + + %1 has been connected to this PC. - + %1 was just connected. What do you want to do? - + iOS Device + + DevicePanel + + + + Wired Connection + + + + + + + Disconnected + + + + + To connect to this network, try plugging a cable in. + + + + + + Connect + + + + + + + Connected + + + + + + + + Disconnect + + + + + Wi-Fi + + + + + Disabled + + + + + To connect to a network, try switching on Wi-Fi. + + + + + + Connecting + + + + + Requires Attention + + + + + Disconnecting + + + + + Choose Network + + + + + Unavailable + + + EndSessionWait @@ -186,7 +269,7 @@ - + Cancel @@ -206,97 +289,97 @@ - - - + + - - + + + Power Off - - - + + + Reboot - + Suspend - - + + Log Out - + Fake Exit - + If you don't do anything, we'll power off for you in 30 seconds. - - + + Terminate App - + Select the app that you want to terminate - + <html><head/><body><p>Terminating an app will allow the app to clean up and then exit. If that doesn't work, you can kill the app, however, killing an app won't let it finish what it's doing. <span style=" font-weight:600;">If you kill an app, you'll lose all unsaved work in that app.</span></p></body></html> - + Terminate - + Kill - + Done - + Up - + All apps will be closed and your device will turn off completely. - + If you don't do anything, we'll power off for you in %1 seconds. - + Log out - - + + Dummy @@ -323,1277 +406,1166 @@ - + System Status - + Network - - - + + + Notifications - + KDE Connect - - - Printers - - - - + System Settings - - + Flight Mode - + Wi-Fi - + Bluetooth - + Power Stretch - + 16:20:00 - + Sunday, 1 Janurary 1111 - + Today - + Timer - + <html><head/><body><p>&quot;Happy Bee&quot;, &quot;Salty Ditty&quot; copyright (c) Kevin MacLeod. Licensed under the Creative Commons CC-BY license.</p></body></html> - - + + Reset - - - - - + + + + + Start - + Stopwatch - + Reminders - - + + Delete Reminder - - + + New Reminder - + Date - + Title - + Create Reminder - + Delete this reminder? - + Reminder - + Delete - - + + Charge History - + Show projected charge - + Charge - + Rate - + Apps - - Right now, you're not connected to any networks. - - - - - Key - - - - - - Connect - - - - - Information - - - - - Active Connection - - - - - Coming soon... - - - - - IPv4 Address: - - - - - IPv6 Address: - - - - - Data Usage - - - - - This is measured by your device and resets every time you boot your PC. Your ISP may count your data usage differently. - - - - - Wi-Fi Information - - - - + No New Notifications - + Clear All Notifications - + KDE Connect is not running. - + Start KDE Connect Daemon - + Ping - + Locate - + Settings and Important Information - + Configure theShell and get important information - + Autostart with - + Enter names of executables to start, seperated by a comma. - - + + Startup - - + + Bar - + Show text on window buttons - + Show windows from other desktops - + Use Status Bar - + Within Gateway - + Fu&ll Screen - + End Session Confirmation - - + + Gateway - - + + Display - + Screen Brightness - + Adjust Screen Resolution - + Redshift - + Pause Redshift - + Start Time - + End Time - - + + HH:mm - + Use Sunlight Cycle (coming soon) - + Redshift Intensity - + If the start time is later than the end time, Redshift will be activated until the end time on the next day. - + System Font - + Accent Color - + Color Scheme - - + + Theme - - Changes will occur in newly started applications. - - - - + &Light - + Dar&k - + Icon Theme - + Show options when connecting media - + Show Notifications on lock screen - + Don't keep notifications from - + Enter app_name parameter - + Keep notifications from blank app_name parameters - + Show Contents - + Hide Contents - + Don't Show - - + + Advanced - + theShell is Copyright (c) Victor Tran 2017. Licensed under the terms of the GNU General Public License, version 3 or later. - + System Information - + You're using - + Support - + Available Swap - + Available Memory - + Kernel Version - + Qt Version - + Notification Sound - + Use Super Key to open Gateway - + Audible Touch Feedback - - + + Input - + <html><head/><body><p>If you'd like to use the Super Key for another key combination, turn this off so that theShell won't take control of it. <span style=" font-weight:600;">Changing t</span><span style=" font-weight:600;">his setting requires you to log out and then log back in.</span></p></body></html> - + Optimise for touch input - + Background - + Browse... - - + + Lock Screen - + Quiet Mode - + Sound - + No Notifications - + Mute - + Attenuate audio - + Lock screen after returning from suspend - + SuspendLockScreenSwitch - + Enable theWave - + Search on Wikipedia - - + + theWave - + + Networks + + + + + Automatically show bar + + + + + Show Bar on bottom of screen + + + + + When this is checked, hovering over the Status Bar will automatically expand the bar. Otherwise, clicking on the Status Bar will expand the bar. + + + + + Screen Scaling + + + + + &100% (96 dpi) + + + + + 1&50% (144 dpi) + + + + + &200% (192 dpi) + + + + + &300% (288 dpi) + + + + + DPI settings will be applied at next login. + + + + + Decorati&ve + + + + + Widget Theme + + + + Si&lent - + Festi&val - + espea&k - + pico&2wave - + Text to Speech engine - + WikipediaSwitch - + Block recognized offensive words - + OffensiveSwitch - + Preferred Name - + theWaveSwitch - + Recognized offensive words will be replaced with asterisks. However, there will probably be some false positives. - - + + Users - + Select a user - + Next - - + + Edit User - + Retype Password - + Full Name - - - - + + + + (unchanged) - - - + + + Username - + Password - + Password Hint - - + + Account Type + + + + + Standard + + + + + Administrator + + + + + Delete User - - - - + + + + Cancel - + Apply Changes - - You're about to delete this user. Are you sure? - - - - + Delete user only - + Delete user and all files - - + + Date and Time - + Set - + Use network to sync date and time - + Use 24 hour time - + TwentyFourHourSwitch - - + + Language - + + Do you also want to keep files from this user? + +Items that will be kept if you choose to keep files: +- Home directory +- Mail Spool +- Temporary Files + + + + + This is the final step. The user will be deleted once you choose whether to keep or remove files. + + + + Changing this setting requires you to log in and then log out. - + HighContrastSwitch - + System Animations - + SystemAnimationsAccessibilitySwitch - + High Contrast - + Large Text - + LargeTextSwitch - + Tone on Caps Lock and Num Lock - + CapsNumLockBellSwitch - - + + Accessibility - + Window Manager Command - + The items under here can do some bad things. Make sure you know what you're doing. - - + + Reset theShell - + Desktop Environment - + Your settings are saved automatically. - + Blue - + Green - + Orange - + Pink - + Turquoise - + About - + theShell %1 - Blueprint - + You compiled theShell on %1 - + theShell %1 - - + + Happy Bee - - + + Playing in the Dark - - + + Ice Cream Truck - - + + Party Complex - - + + Salty Ditty - - - Idle - - - - - Printing - - - - - Stopped - - - - - Disconnected from the Internet - - - - - - Wired Connection - - - - - You've been disconnected from the internet over a wired connection - - - - - Connected over a wired connection - - - - - You're now connected to the internet over a wired connection - - - - - - Wireless Connection - - - - - You've been disconnected from the internet over a wireless connection - - - - - Connecting to %1... - - - - - Getting IP address from %1... - - - - - Doing some checks... - - - - - Connecting to a secondary connection... - - - - - You're now connected to the network "%1" - - - - - Disconnecting from %1... - - - - - - Bluetooth Connection - - - - - You're now connected to the internet over a bluetooth connection - - - - - Connected to %1 over Bluetooth - - - - - You've been disconnected from the internet over a bluetooth connection - - - - - Can't get to the internet - - - - - Login required - - - - - NetworkManager Error - - - - - Data Sent: %1 - - - - - Data Received: %1 - - - - - Signal Strength: %1 - - - - - Frequency: %1 - - - - - Disconnect - - - - - + + Pause - + Timer Elapsed - + Your timer has completed. - + Resume - + Current Battery Percentage: %1 - + theShell Uptime: %1 - + 1 day - + %1 days - + System Uptime: %1 - + Couldn't get system uptime - + All settings will be reset to default, and you will be logged out. Are you sure you want to do this? - + Stop - + Locate Device - + Your device will ring at full volume. Tap the button on the screen of the device to silence it. - + Last updated %1 - + Log in to network - + Network Login - + Your connection to the internet is blocked by a login page. - + Add New User - + New User - - - - + + + + (none) - + + + (set at next login) + + + + Password Check - + The passwords don't match. - + The username must not contain spaces. - + The username must not contain capital letters. - + Rate History - + Application Power Usage + + + Oxygen + + + + + Breeze + + Internationalisation - - - - + + + + English - + Vietnamese - + Danish - - Portuguese - - - - + Dutch - + Spanish - + Russian - + Swedish + + + Lithuanian + + LoginSplash @@ -1617,7 +1589,7 @@ - + No Notifications @@ -1662,12 +1634,17 @@ - + + Click to show bar + + + + Sound - + Mute @@ -1682,37 +1659,37 @@ - + Quiet Mode - + Desktop %1 - + For %1 - + Close - + No notifications - + 1 notification - + %1 notifications @@ -1759,7 +1736,7 @@ - + You're about to power off your PC. Are you sure? @@ -1881,7 +1858,7 @@ - + Hit "Speak" to start speaking. @@ -2082,33 +2059,33 @@ - - + + Hey, %1! - + Before you power off your PC, you may want to check this. - + Can't place a call from this device. - + Can't send messages from this device. - + theWave Help. - + For "%1" @@ -2116,57 +2093,214 @@ NativeEventFilter - - + + Brightness - - - - + + + + Volume - - + + Quiet Mode is set to Mute. - + No Notifications - + Mute - + Sound - - + + Keyboard Brightness - + Eject - + Attempting to eject disc... + + NetworkWidget + + + Form + + + + + Network Devices + + + + + Available Networks + + + + + + + Back + + + + + Enter Details Manually + + + + + Security + + + + + SSID + + + + + None + + + + + Static WEP + + + + + Dynamic WEP + + + + + WPA/WPA2 PSK + + + + + WPA/WPA2 Enterprise + + + + + Security Key + + + + + WPA Enterprise settings coming soon. For now, use nmcli in a terminal to connect to this network. + + + + + Connect + + + + + Information + + + + + Property + + + + + Value + + + + + Connect to %1? + + + + + + + To connect to %1, you'll need to provide a key. + + + + + To connect to %1, you'll need to provide authentication details. + + + + + + Wi-Fi + + + + + + Connecting to %1... + + + + + + + + Disconnected + + + + + Wired + + + + + WPA Enterprise + + + + + WPA Enterprise connections are not supported yet. + + + + + Connection Error + + + + + Enter the information to connect to a new network + + + NewMedia @@ -2337,7 +2471,7 @@ - + Power Off @@ -2352,8 +2486,8 @@ - - + + Welcome to theShell %1! @@ -2421,17 +2555,17 @@ - + To debug, attach a debugger to PID %1 - + Reset theShell? - + You're about to reset theShell. Are you sure? @@ -2439,9 +2573,9 @@ SysTrayIcons - - - + + + System Tray Unavailable. @@ -2662,136 +2796,136 @@ UPowerDBus - + Can't get battery information. - + Power Stretch on - - - + + + Charging - + The power cable has been plugged in and the battery is now being charged. Power Stretch has been turned off. - + The power cable has been plugged in and the battery is now being charged. - - + + Discharging - + The power cable has been removed, and your PC is now running on battery power. - - - + + + Turn on Power Stretch - + Battery Critically Low - + You have about 10 minutes of battery remaining. Either plug in your PC or save your work and power off the PC and change the battery. - + Battery Low - + You have about half an hour of battery remaining. You should plug in your PC now. - + Battery Warning - + You have about an hour of battery remaining. You may want to plug in your PC now. - - + + Empty - - + + Full - - + + Not Charging - - + + %1% PC Battery%2 - + No Battery Inserted - + Pair %1 using theFile to see battery status. - + %1 battery unavailable. Device trusted? - + %1% battery on %2 - + %1% battery on %2 (Full) - + %1% battery on %2 (Charging) - + %1% battery on %2 (Discharging) @@ -2799,22 +2933,22 @@ main - + theShell already running - + theShell seems to already be running. Do you wish to start theShell anyway? - + Window Manager couldn't start - + The window manager "%1" could not start. Enter the name or path of a window manager to attempt to start a different windowmanager, or hit 'Cancel' to start theShell without a window manager.