diff options
Diffstat (limited to 'src-qt5')
18 files changed, 218 insertions, 139 deletions
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts index 332a6211..c214a0c1 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts @@ -345,7 +345,7 @@ </message> <message> <location filename="../LPlugins.cpp" line="67"/> - <source>Start menu alternative focusing on the user's files, directories, and favorites.</source> + <source>Start menu alternative focusing on the user's files, directories, and favorites.</source> <translation>Alternativ startmenu som fokuserer på brugerens filer, mapper og favoritter.</translation> </message> <message> @@ -1244,12 +1244,12 @@ </message> <message> <location filename="../pages/page_fluxbox_keys.ui" line="244"/> - <source>"Mod1": Alt key -"Mod4": Windows/Mac key -"Control": Ctrl key</source> - <translation>"Mod1": Alt-tast -"Mod4": Windows-/Mac-tast -"Control": Ctrl-tast</translation> + <source>"Mod1": Alt key +"Mod4": Windows/Mac key +"Control": Ctrl key</source> + <translation>"Mod1": Alt-tast +"Mod4": Windows-/Mac-tast +"Control": Ctrl-tast</translation> </message> <message> <location filename="../pages/page_fluxbox_keys.cpp" line="70"/> @@ -1396,7 +1396,7 @@ <message> <location filename="../pages/page_interface_desktop.ui" line="86"/> <source>Display Removable Media Icons</source> - <translation type="unfinished"></translation> + <translation>Vis ikoner for flytbare medier</translation> </message> <message> <location filename="../pages/page_interface_desktop.cpp" line="56"/> diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts index ff9b890b..88412f8b 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts @@ -24,7 +24,7 @@ <message> <location filename="../ColorDialog.ui" line="28"/> <source>Color Scheme:</source> - <translation>配色方案</translation> + <translation>配色方案:</translation> </message> <message> <location filename="../ColorDialog.ui" line="51"/> @@ -106,7 +106,7 @@ <message> <location filename="../GetPluginDialog.ui" line="26"/> <source>Select a Plugin:</source> - <translation>选择插件</translation> + <translation>选择插件:</translation> </message> <message> <location filename="../GetPluginDialog.ui" line="57"/> @@ -310,7 +310,7 @@ <message> <location filename="../LPlugins.cpp" line="144"/> <source>Display area for dockable system applications</source> - <translation>显示托盘化的应用程序。</translation> + <translation type="unfinished">显示托盘化系统程序的区域</translation> </message> <message> <location filename="../LPlugins.cpp" line="151"/> @@ -438,7 +438,7 @@ <message> <location filename="../LPlugins.cpp" line="226"/> <source>Keep track of system statistics such as CPU/Memory usage and CPU temperatures.</source> - <translation>跟踪系统状态，例如 CPU/内存使用率以及 CPU 温度</translation> + <translation>跟踪系统状态，例如 CPU/内存使用率以及 CPU 温度。</translation> </message> <message> <location filename="../LPlugins.cpp" line="232"/> @@ -551,7 +551,7 @@ <message> <location filename="../LPlugins.cpp" line="324"/> <source>Color to use for all visible text.</source> - <translation>用于所有可见文字的颜色</translation> + <translation>用于所有可见文字的颜色。</translation> </message> <message> <location filename="../LPlugins.cpp" line="329"/> @@ -1431,12 +1431,12 @@ <message> <location filename="../pages/page_interface_panels.ui" line="69"/> <source>Profile</source> - <translation type="unfinished"></translation> + <translation>配置文件</translation> </message> <message> <location filename="../pages/page_interface_panels.ui" line="82"/> <source>Import</source> - <translation type="unfinished">导入</translation> + <translation>导入</translation> </message> <message> <location filename="../pages/page_interface_panels.cpp" line="58"/> @@ -1469,7 +1469,7 @@ <message> <location filename="../pages/page_main.cpp" line="64"/> <source>Desktop Defaults</source> - <translation type="unfinished"></translation> + <translation>桌面默认值</translation> </message> <message> <location filename="../pages/page_main.cpp" line="68"/> @@ -1887,12 +1887,12 @@ <message> <location filename="../pages/page_theme.cpp" line="137"/> <source>None</source> - <translation type="unfinished"></translation> + <translation>无</translation> </message> <message> <location filename="../pages/page_theme.cpp" line="138"/> <source>Manual Setting</source> - <translation type="unfinished"></translation> + <translation>手动设置</translation> </message> </context> <context> diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 575ae5a1..d76c68e9 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -9,13 +9,14 @@ #include <QDesktopWidget> #include <QApplication> #include <QScreen> +#include <QSettings> #include "LuminaThemes.h" static QStringList fav; QString LDesktopUtils::LuminaDesktopVersion(){ - QString ver = "1.2.1"; + QString ver = "1.2.2"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif @@ -526,3 +527,19 @@ int LDesktopUtils::VersionStringToNumber(QString version){ //NOTE: This format allows numbers to be anywhere from 0->999 without conflict return (maj*1000000 + mid*1000 + min); } + +void LDesktopUtils::MigrateDesktopSettings(QSettings *settings, QString fromID, QString toID){ + //desktop-ID + QStringList keys = settings->allKeys(); + QStringList filter = keys.filter("desktop-"+fromID+"/"); + for(int i=0; i<filter.length(); i++){ + settings->setValue("desktop-"+toID+"/"+filter[i].section("/",1,-1), settings->value(filter[i])); + settings->remove(filter[i]); + } + //panel_ID.[number] + filter = keys.filter("panel_"+fromID+"."); + for(int i=0; i<filter.length(); i++){ + settings->setValue("panel_"+toID+"."+ filter[i].section("/",0,0).section(".",-1)+"/"+filter[i].section("/",1,-1), settings->value(filter[i])); + settings->remove(filter[i]); + } +} diff --git a/src-qt5/core/libLumina/LDesktopUtils.h b/src-qt5/core/libLumina/LDesktopUtils.h index dbad8757..b21bc78a 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.h +++ b/src-qt5/core/libLumina/LDesktopUtils.h @@ -12,6 +12,7 @@ #include <QFile> #include <QDir> #include <QDateTime> +#include <QSettings> //Other classes needed #include <LUtils.h> @@ -44,6 +45,10 @@ public: static void LoadSystemDefaults(bool skipOS = false); static bool checkUserFiles(QString lastversion); //returns true if something changed static int VersionStringToNumber(QString version); //convert the lumina version string to a number for comparisons + + //Migrating desktop settings from one ID to another + static void MigrateDesktopSettings(QSettings *settings, QString fromID, QString toID); + }; #endif diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 735390aa..8932ac36 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -403,6 +403,25 @@ void LSession::updateDesktops(){ bool firstrun = (DESKTOPS.length()==0); bool numchange = DESKTOPS.length()!=sC; + QSettings dset("lumina-desktop", "desktopsettings"); + if(firstrun && sC==1){ + //Sanity check - ensure the monitor ID did not change between sessions for single-monitor setups + QString name = QApplication::screens().at(0)->name(); + if(!dset.contains("desktop-"+name+"/screen/lastHeight")){ + //Empty Screen - find the previous one and migrate the settings over + QStringList old = dset.allKeys().filter("desktop-").filter("/screen/lastHeight"); + QStringList lastused = dset.value("last_used_screens").toStringList(); + QString oldname; + for(int i=0; i<old.length(); i++){ + QString tmp = old[i].section("/",0,0).section("-",1,-1); //old desktop ID + if(tmp=="default"){ continue; } //always skip this one + else if(lastused.contains(tmp)){ + oldname = tmp; break; //use the first screen that was last used + } + } + if(!oldname.isEmpty()){ LDesktopUtils::MigrateDesktopSettings(&dset, oldname, name); } + } + } // If the screen count is changing on us if ( sC != DW->screenCount() ) { @@ -431,7 +450,10 @@ void LSession::updateDesktops(){ } //Now add any new desktops + QStringList allNames; + QList<QScreen*> scrns = QApplication::screens(); for(int i=0; i<sC; i++){ + allNames << scrns.at(i)->name(); if(!dnums.contains(i) && !geoms.contains(DW->screenGeometry(i)) ){ //Start the desktop on this screen qDebug() << " - Start desktop on screen:" << i; @@ -439,7 +461,7 @@ void LSession::updateDesktops(){ geoms << DW->screenGeometry(i); } } - + dset.setValue("last_used_screens", allNames); //Make sure fluxbox also gets prompted to re-load screen config if the number of screens changes in the middle of a session if(numchange && !firstrun) { qDebug() << "Update WM"; @@ -449,7 +471,6 @@ void LSession::updateDesktops(){ //Make sure all the background windows are registered on the system as virtual roots QTimer::singleShot(100,this, SLOT(registerDesktopWindows())); //Determine if any High-DPI screens are available and enable auto-scaling as needed - QList<QScreen*> scrns = QApplication::screens(); for(int i=0; i<scrns.length(); i++){ qDebug() << "Check Screen DPI:" << scrns[i]->name(); qDebug() << " -- Physical DPI:" << scrns[i]->physicalDotsPerInchX() << "x" << scrns[i]->physicalDotsPerInchY(); diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts index d76cb040..e7030f75 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts @@ -1357,7 +1357,7 @@ <message> <location filename="../panel-plugins/systemstart/StartMenu.ui" line="199"/> <source>Browse Applications</source> - <translation>Navega per les aplicacions</translation> + <translation>Navegueu per les aplicacions</translation> </message> <message> <location filename="../panel-plugins/systemstart/StartMenu.ui" line="234"/> @@ -1382,7 +1382,7 @@ <message> <location filename="../panel-plugins/systemstart/StartMenu.ui" line="488"/> <source>Configure Desktop</source> - <translation>Configura l'escriptori</translation> + <translation>Configureu l'escriptori</translation> </message> <message> <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1065"/> @@ -1402,7 +1402,7 @@ <message> <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1017"/> <source>Power Off System</source> - <translation>Apaga el sistema</translation> + <translation>Atura el sistema</translation> </message> <message> <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1036"/> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts index 7715a76f..655ee9e7 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -40,47 +40,47 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="64"/> <source>Launch %1</source> - <translation type="unfinished">Start %1</translation> + <translation>Start %1</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="103"/> <source>Open</source> - <translation type="unfinished">Åbn</translation> + <translation>Åbn</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="104"/> <source>Open With</source> - <translation type="unfinished"></translation> + <translation>Åbn med</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="106"/> <source>View Properties</source> - <translation type="unfinished"></translation> + <translation>Vis egenskaber</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="107"/> <source>File Operations</source> - <translation type="unfinished"></translation> + <translation>Filhandlinger</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="109"/> <source>Rename</source> - <translation type="unfinished"></translation> + <translation>Omdøb</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="111"/> <source>Copy</source> - <translation type="unfinished">Kopiér</translation> + <translation>Kopiér</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="113"/> <source>Cut</source> - <translation type="unfinished">Klip</translation> + <translation>Klip</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="114"/> <source>Delete</source> - <translation type="unfinished">Slet</translation> + <translation>Slet</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="174"/> @@ -95,7 +95,7 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="243"/> <source>New Filename</source> - <translation type="unfinished"></translation> + <translation>Nyt filnavn</translation> </message> </context> <context> @@ -265,12 +265,12 @@ </message> <message> <location filename="../BootSplash.cpp" line="63"/> - <source>Don't expect to build up the weak by pulling down the strong.</source> + <source>Don't expect to build up the weak by pulling down the strong.</source> <translation>Forvent ikke at opbygge det svage ved at nedrive det stærke.</translation> </message> <message> <location filename="../BootSplash.cpp" line="65"/> - <source>You can't know too much, but you can say too much.</source> + <source>You can't know too much, but you can say too much.</source> <translation>Du kan ikke vide for meget, men du kan sige for meget.</translation> </message> <message> @@ -350,7 +350,7 @@ </message> <message> <location filename="../BootSplash.cpp" line="97"/> - <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source> + <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source> <translation>Kun to ting er uendelige, universet og menneskelig dumhed, og jeg er ikke sikker på det første.</translation> </message> <message> @@ -360,8 +360,8 @@ </message> <message> <location filename="../BootSplash.cpp" line="101"/> - <source>Do, or do not. There is no 'try'.</source> - <translation>Gør eller lad være. Der er ikke noget "prøv".</translation> + <source>Do, or do not. There is no 'try'.</source> + <translation>Gør eller lad være. Der er ikke noget "prøv".</translation> </message> <message> <location filename="../BootSplash.cpp" line="103"/> @@ -380,7 +380,7 @@ </message> <message> <location filename="../BootSplash.cpp" line="109"/> - <source>It's kind of fun to do the impossible.</source> + <source>It's kind of fun to do the impossible.</source> <translation>Det er egentligt sjovt at gøre det umulige.</translation> </message> <message> @@ -692,7 +692,7 @@ <message> <location filename="../desktop-plugins/LDPlugin.cpp" line="37"/> <source>Modify Item</source> - <translation type="unfinished"></translation> + <translation>Rediger element</translation> </message> <message> <location filename="../desktop-plugins/LDPlugin.cpp" line="45"/> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts index 43729936..7adc4ca2 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts @@ -50,12 +50,12 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="104"/> <source>Open With</source> - <translation type="unfinished"></translation> + <translation>Öppna med</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="106"/> <source>View Properties</source> - <translation type="unfinished"></translation> + <translation>Visa egenskaper</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="107"/> @@ -65,7 +65,7 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="109"/> <source>Rename</source> - <translation type="unfinished"></translation> + <translation>Döp om</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="111"/> @@ -95,7 +95,7 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="243"/> <source>New Filename</source> - <translation type="unfinished"></translation> + <translation>Nytt filnamn</translation> </message> </context> <context> @@ -196,7 +196,7 @@ <message> <location filename="../BootSplash.ui" line="94"/> <source>Starting the Lumina Desktop...</source> - <translation>Startar Lumina skrivbordet...</translation> + <translation>Startar Lumina-skrivbordet...</translation> </message> <message> <location filename="../BootSplash.cpp" line="15"/> @@ -206,17 +206,17 @@ <message> <location filename="../BootSplash.cpp" line="39"/> <source>This desktop is powered by coffee, coffee, and more coffee.</source> - <translation type="unfinished"></translation> + <translation>Detta skrivbord drivs av kaffe, kaffe och mer kaffe.</translation> </message> <message> <location filename="../BootSplash.cpp" line="41"/> <source>Keep up with desktop news!</source> - <translation type="unfinished"></translation> + <translation>Håll dig uppdaterad med skrivbordsnyheterna!</translation> </message> <message> <location filename="../BootSplash.cpp" line="43"/> <source>There is a full handbook of information about the desktop available online.</source> - <translation type="unfinished"></translation> + <translation>Det finns en handbok full av information om skrivbordet tillgängligt online.</translation> </message> <message> <location filename="../BootSplash.cpp" line="45"/> @@ -265,12 +265,12 @@ </message> <message> <location filename="../BootSplash.cpp" line="63"/> - <source>Don't expect to build up the weak by pulling down the strong.</source> + <source>Don't expect to build up the weak by pulling down the strong.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../BootSplash.cpp" line="65"/> - <source>You can't know too much, but you can say too much.</source> + <source>You can't know too much, but you can say too much.</source> <translation type="unfinished"></translation> </message> <message> @@ -350,7 +350,7 @@ </message> <message> <location filename="../BootSplash.cpp" line="97"/> - <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source> + <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source> <translation type="unfinished"></translation> </message> <message> @@ -360,7 +360,7 @@ </message> <message> <location filename="../BootSplash.cpp" line="101"/> - <source>Do, or do not. There is no 'try'.</source> + <source>Do, or do not. There is no 'try'.</source> <translation type="unfinished"></translation> </message> <message> @@ -380,7 +380,7 @@ </message> <message> <location filename="../BootSplash.cpp" line="109"/> - <source>It's kind of fun to do the impossible.</source> + <source>It's kind of fun to do the impossible.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts index 04c6e38f..a19d5933 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts @@ -50,17 +50,17 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="104"/> <source>Open With</source> - <translation type="unfinished"></translation> + <translation>打开用</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="106"/> <source>View Properties</source> - <translation type="unfinished"></translation> + <translation>查看属性</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="107"/> <source>File Operations</source> - <translation type="unfinished"></translation> + <translation>文件操作</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="109"/> @@ -70,17 +70,17 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="111"/> <source>Copy</source> - <translation type="unfinished">复制</translation> + <translation>复制</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="113"/> <source>Cut</source> - <translation type="unfinished">剪切</translation> + <translation>剪切</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="114"/> <source>Delete</source> - <translation type="unfinished">删除</translation> + <translation>删除</translation> </message> <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="174"/> @@ -95,7 +95,7 @@ <message> <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="243"/> <source>New Filename</source> - <translation type="unfinished"></translation> + <translation>新文件名</translation> </message> </context> <context> @@ -196,12 +196,12 @@ <message> <location filename="../BootSplash.ui" line="94"/> <source>Starting the Lumina Desktop...</source> - <translation type="unfinished"></translation> + <translation>正在启动 Lumina 桌面...</translation> </message> <message> <location filename="../BootSplash.cpp" line="15"/> <source>Version %1</source> - <translation type="unfinished"></translation> + <translation>版本 %1</translation> </message> <message> <location filename="../BootSplash.cpp" line="39"/> @@ -211,7 +211,7 @@ <message> <location filename="../BootSplash.cpp" line="41"/> <source>Keep up with desktop news!</source> - <translation type="unfinished"></translation> + <translation>保持桌面最新！</translation> </message> <message> <location filename="../BootSplash.cpp" line="43"/> @@ -221,7 +221,7 @@ <message> <location filename="../BootSplash.cpp" line="45"/> <source>Want to change the interface? Everything is customizable in the desktop configuration!</source> - <translation type="unfinished"></translation> + <translation>想改变界面？桌面配置中的一切都是可定制的！</translation> </message> <message> <location filename="../BootSplash.cpp" line="47"/> @@ -231,7 +231,7 @@ <message> <location filename="../BootSplash.cpp" line="49"/> <source>This desktop is generously sponsored by iXsystems</source> - <translation type="unfinished"></translation> + <translation>这个桌面是由 iXsystems 慷慨赞助</translation> </message> <message> <location filename="../BootSplash.cpp" line="51"/> @@ -246,22 +246,22 @@ <message> <location filename="../BootSplash.cpp" line="55"/> <source>Everything has its beauty but not everyone sees it.</source> - <translation type="unfinished"></translation> + <translation>万物皆有动人之处，然非众人皆能洞悉。</translation> </message> <message> <location filename="../BootSplash.cpp" line="57"/> <source>Before God we are all equally wise - and equally foolish.</source> - <translation type="unfinished"></translation> + <translation>在上帝面前，我们都同样聪明，同样愚蠢。</translation> </message> <message> <location filename="../BootSplash.cpp" line="59"/> <source>We cannot do everything at once, but we can do something at once.</source> - <translation type="unfinished"></translation> + <translation>我们不能马上做每件事，但我们可以马上做某事。</translation> </message> <message> <location filename="../BootSplash.cpp" line="61"/> <source>One with the law is a majority.</source> - <translation type="unfinished"></translation> + <translation>谁拥有法律，谁就是大多数。</translation> </message> <message> <location filename="../BootSplash.cpp" line="63"/> @@ -286,62 +286,62 @@ <message> <location filename="../BootSplash.cpp" line="71"/> <source>Never trust a computer you can’t throw out a window.</source> - <translation type="unfinished"></translation> + <translation>永远不要信任那些你无法将其抛出窗外的电脑。</translation> </message> <message> <location filename="../BootSplash.cpp" line="73"/> <source>Study the past if you would define the future.</source> - <translation type="unfinished"></translation> + <translation>如果你想定义未来，就请研究过去。</translation> </message> <message> <location filename="../BootSplash.cpp" line="75"/> <source>The way to get started is to quit talking and begin doing.</source> - <translation type="unfinished"></translation> + <translation>开始的方法是放弃说，开始做。</translation> </message> <message> <location filename="../BootSplash.cpp" line="77"/> <source>Ask and it will be given to you; search, and you will find; knock and the door will be opened for you.</source> - <translation type="unfinished"></translation> + <translation>你们祈求，就给你们；寻找，就寻见；叩门，就给你开门。</translation> </message> <message> <location filename="../BootSplash.cpp" line="79"/> <source>Start where you are. Use what you have. Do what you can.</source> - <translation type="unfinished"></translation> + <translation>从哪跌倒，从哪爬起来，珍惜你所拥有的。做你能做的。</translation> </message> <message> <location filename="../BootSplash.cpp" line="81"/> <source>A person who never made a mistake never tried anything new.</source> - <translation type="unfinished"></translation> + <translation>从不犯错的人也从不尝试新的事物。</translation> </message> <message> <location filename="../BootSplash.cpp" line="83"/> <source>It does not matter how slowly you go as long as you do not stop.</source> - <translation type="unfinished"></translation> + <translation>无论你走得多慢，只要你不停止。</translation> </message> <message> <location filename="../BootSplash.cpp" line="85"/> <source>Do what you can, where you are, with what you have.</source> - <translation type="unfinished"></translation> + <translation>无论身处何境,倾你所有,尽你所能。</translation> </message> <message> <location filename="../BootSplash.cpp" line="87"/> <source>Remember no one can make you feel inferior without your consent.</source> - <translation type="unfinished"></translation> + <translation>不要妄自菲薄。</translation> </message> <message> <location filename="../BootSplash.cpp" line="89"/> <source>It’s not the years in your life that count. It’s the life in your years.</source> - <translation type="unfinished"></translation> + <translation>重要的不是你活了多久，而是怎么活。</translation> </message> <message> <location filename="../BootSplash.cpp" line="91"/> <source>Either write something worth reading or do something worth writing.</source> - <translation type="unfinished"></translation> + <translation>要么写一些值得读的，要么做一些值得写的。</translation> </message> <message> <location filename="../BootSplash.cpp" line="93"/> <source>The only way to do great work is to love what you do.</source> - <translation type="unfinished"></translation> + <translation>成大事的唯一途径就是做自己喜欢做的事情。</translation> </message> <message> <location filename="../BootSplash.cpp" line="95"/> @@ -351,17 +351,17 @@ <message> <location filename="../BootSplash.cpp" line="97"/> <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source> - <translation type="unfinished"></translation> + <translation>有两件事是无限的，宇宙和人类的愚蠢，而我对前者不确定。</translation> </message> <message> <location filename="../BootSplash.cpp" line="99"/> <source>I find that the harder I work, the more luck I seem to have.</source> - <translation type="unfinished"></translation> + <translation>我发现，我越是努力，就越发幸运。</translation> </message> <message> <location filename="../BootSplash.cpp" line="101"/> <source>Do, or do not. There is no 'try'.</source> - <translation type="unfinished"></translation> + <translation>做，或不做。没有“尝试”。</translation> </message> <message> <location filename="../BootSplash.cpp" line="103"/> @@ -371,7 +371,7 @@ <message> <location filename="../BootSplash.cpp" line="105"/> <source>Good people do not need laws to tell them to act responsibly, while bad people will find a way around the laws.</source> - <translation type="unfinished"></translation> + <translation>好人不需要法律告知他们负起责任,恶人总是绕法律边缘而行。</translation> </message> <message> <location filename="../BootSplash.cpp" line="107"/> @@ -381,12 +381,12 @@ <message> <location filename="../BootSplash.cpp" line="109"/> <source>It's kind of fun to do the impossible.</source> - <translation type="unfinished"></translation> + <translation>乐在为不可为之事。</translation> </message> <message> <location filename="../BootSplash.cpp" line="111"/> <source>Knowledge speaks, but wisdom listens.</source> - <translation type="unfinished"></translation> + <translation>知识是倾诉，但智慧是倾听。</translation> </message> <message> <location filename="../BootSplash.cpp" line="113"/> @@ -396,7 +396,7 @@ <message> <location filename="../BootSplash.cpp" line="115"/> <source>Success usually comes to those who are too busy to be looking for it.</source> - <translation type="unfinished"></translation> + <translation>成功往往青睐那些努力为它奋斗的人们。</translation> </message> <message> <location filename="../BootSplash.cpp" line="117"/> @@ -411,17 +411,17 @@ <message> <location filename="../BootSplash.cpp" line="121"/> <source>The best way to predict the future is to invent it.</source> - <translation type="unfinished"></translation> + <translation>预测未来最好的方法就是发明未来。</translation> </message> <message> <location filename="../BootSplash.cpp" line="123"/> <source>Well done is better than well said.</source> - <translation type="unfinished"></translation> + <translation>说的好不如做的好。</translation> </message> <message> <location filename="../BootSplash.cpp" line="125"/> <source>Sometimes it is not enough that we do our best; we must do what is required.</source> - <translation type="unfinished"></translation> + <translation>仅仅做到我们的最好是不够的，有时候我们得达到要求。</translation> </message> <message> <location filename="../BootSplash.cpp" line="127"/> @@ -431,7 +431,7 @@ <message> <location filename="../BootSplash.cpp" line="129"/> <source>Better to remain silent and be thought a fool than to speak out and remove all doubt.</source> - <translation type="unfinished"></translation> + <translation>做一个消除一切疑虑的出头鸟，还不如保持沉默被当成傻子。</translation> </message> <message> <location filename="../BootSplash.cpp" line="140"/> @@ -692,7 +692,7 @@ <message> <location filename="../desktop-plugins/LDPlugin.cpp" line="37"/> <source>Modify Item</source> - <translation type="unfinished"></translation> + <translation>修改项目</translation> </message> <message> <location filename="../desktop-plugins/LDPlugin.cpp" line="45"/> @@ -788,7 +788,7 @@ <message> <location filename="../LDesktop.cpp" line="293"/> <source>Lock Session</source> - <translation type="unfinished"></translation> + <translation>锁定会话</translation> </message> <message> <location filename="../LDesktop.cpp" line="294"/> @@ -1037,52 +1037,52 @@ <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="69"/> <source>Clear Playlist</source> - <translation type="unfinished">清除播放列表</translation> + <translation>清除播放列表</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="70"/> <source>Shuffle Playlist</source> - <translation type="unfinished">乱序播放列表</translation> + <translation>随机播放列表</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="72"/> <source>Add Files</source> - <translation type="unfinished">添加文件</translation> + <translation>添加文件</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="73"/> <source>Add Directory</source> - <translation type="unfinished">添加目录</translation> + <translation>添加目录</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="74"/> <source>Add URL</source> - <translation type="unfinished">添加 URL</translation> + <translation>添加 URL</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="102"/> <source>Multimedia Files</source> - <translation type="unfinished">多媒体文件</translation> + <translation>多媒体文件</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="103"/> <source>Select Multimedia Files</source> - <translation type="unfinished">选择媒体文件</translation> + <translation>选择媒体文件</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="130"/> <source>Select Multimedia Directory</source> - <translation type="unfinished">选择多媒体目录</translation> + <translation>选择多媒体目录</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="159"/> <source>Enter a valid URL for a multimedia file or stream:</source> - <translation type="unfinished">输入一个有效的网址为一个多媒体文件或stream：</translation> + <translation>输入一个有效的网址为一个多媒体文件或 stream：</translation> </message> <message> <location filename="../panel-plugins/audioplayer/PPlayerWidget.cpp" line="161"/> <source>Multimedia URL</source> - <translation type="unfinished">多媒体键网址</translation> + <translation>多媒体网址</translation> </message> </context> <context> @@ -1286,7 +1286,7 @@ <message> <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="147"/> <source>Last Build Date: %1</source> - <translation type="unfinished">最后构建于: %1</translation> + <translation>最后构建日期: %1</translation> </message> <message> <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="148"/> @@ -1314,7 +1314,7 @@ <message> <location filename="../SettingsMenu.cpp" line="33"/> <source>Wallpaper</source> - <translation type="unfinished"></translation> + <translation>壁纸</translation> </message> <message> <location filename="../SettingsMenu.cpp" line="36"/> @@ -1324,7 +1324,7 @@ <message> <location filename="../SettingsMenu.cpp" line="39"/> <source>All Desktop Settings</source> - <translation type="unfinished"></translation> + <translation>所有桌面设置</translation> </message> <message> <location filename="../SettingsMenu.cpp" line="54"/> diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts b/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts index b63091fb..9ecd207f 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts @@ -26,7 +26,7 @@ <message> <location filename="../LFileDialog.ui" line="131"/> <source>Binary Location</source> - <translation>Binärens Plats</translation> + <translation>Binärens plats</translation> </message> <message> <location filename="../LFileDialog.ui" line="138"/> @@ -51,7 +51,7 @@ <message> <location filename="../LFileDialog.cpp" line="40"/> <source>(Email Link)</source> - <translation>(Email Länk)</translation> + <translation>(Emaillänk)</translation> </message> <message> <location filename="../LFileDialog.cpp" line="41"/> @@ -136,7 +136,7 @@ <message> <location filename="../LFileDialog.cpp" line="278"/> <source>Find Application Binary</source> - <translation>Hitta Programmets Binär </translation> + <translation>Hitta programmets binär</translation> </message> </context> <context> @@ -171,12 +171,12 @@ <message> <location filename="../main.cpp" line="276"/> <source>Application shortcut is missing the launching information (malformed shortcut): %1</source> - <translation>Program genväg saknar startinformation (missbildad genväg): %1</translation> + <translation>Programgenväg saknar startinformation (missbildad genväg): %1</translation> </message> <message> <location filename="../main.cpp" line="289"/> <source>URL shortcut is missing the URL: %1</source> - <translation>URL genväg saknas URL: %1</translation> + <translation>URL-genvägen saknar URL: %1</translation> </message> <message> <location filename="../main.cpp" line="300"/> @@ -195,13 +195,13 @@ </message> <message> <location filename="../main.cpp" line="368"/> - <source>Could not find "%1". Please ensure it is installed first.</source> - <translation>Kunde inte hitta "%1". Se till att du har detta programmet installerat först.</translation> + <source>Could not find "%1". Please ensure it is installed first.</source> + <translation>Kunde inte hitta "%1". Se till att du har detta programmet installerat först.</translation> </message> <message> <location filename="../main.cpp" line="418"/> <source>Application Error</source> - <translation>Program fel</translation> + <translation>Programfel</translation> </message> <message> <location filename="../main.cpp" line="418"/> diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts b/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts index 59c5ff5c..fdbf55df 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts @@ -131,7 +131,7 @@ <message> <location filename="../LFileDialog.cpp" line="211"/> <source>[default] </source> - <translation type="unfinished"></translation> + <translation>[默认] </translation> </message> <message> <location filename="../LFileDialog.cpp" line="278"/> @@ -166,7 +166,7 @@ <message> <location filename="../main.cpp" line="265"/> <source>Application entry is invalid: %1</source> - <translation type="unfinished"></translation> + <translation>应用程序输入无效: %1</translation> </message> <message> <location filename="../main.cpp" line="276"/> diff --git a/src-qt5/desktop-utils/desktop-utils.pro b/src-qt5/desktop-utils/desktop-utils.pro index 2fea1adb..067fddd0 100644 --- a/src-qt5/desktop-utils/desktop-utils.pro +++ b/src-qt5/desktop-utils/desktop-utils.pro @@ -10,7 +10,7 @@ SUBDIRS+= lumina-fm \ lumina-textedit \ lumina-calculator \ lumina-archiver \ - lumina-notify \ +# lumina-notify \ lumina-mediaplayer \ lumina-xdg-entry # lumina-terminal diff --git a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_sv.ts b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_sv.ts index ed4d5941..9703a7a7 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_sv.ts +++ b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_sv.ts @@ -33,7 +33,7 @@ <message> <location filename="../MainUI.ui" line="111"/> <source>Note: The time a file was created might be more recent than the time modified if the file permissions were changed recently.</source> - <translation>Obs: Tiden en fil skapades kan vara nyare än den tid ändras om filrättigheterna ändrades nyligen.</translation> + <translation>Obs: Tiden en fil skapades kan vara nyare än den tid filen sist ändrades om filrättigheterna ändrades nyligen.</translation> </message> <message> <location filename="../MainUI.ui" line="124"/> @@ -169,12 +169,12 @@ <message> <location filename="../MainUI.cpp" line="249"/> <source>Save Application File</source> - <translation>Spara Program fil</translation> + <translation>Spara programfil</translation> </message> <message> <location filename="../MainUI.cpp" line="249"/> <source>Application Registrations (*.desktop)</source> - <translation type="unfinished"></translation> + <translation>Applikationsregistreringar (*.desktop)</translation> </message> <message> <location filename="../MainUI.cpp" line="290"/> @@ -189,7 +189,7 @@ <message> <location filename="../MainUI.cpp" line="293"/> <source>Invalid selection: Not a valid executable</source> - <translation>Ogiltig val: Inte giltig körbar fil</translation> + <translation>Ogiltigt val: Inte giltig körbar fil</translation> </message> <message> <location filename="../MainUI.cpp" line="305"/> @@ -204,13 +204,13 @@ <message> <location filename="../MainUI.cpp" line="318"/> <source>Images (%1);; All Files (*)</source> - <translation>Bilder (%1);; Alla Filer (*)</translation> + <translation>Bilder (%1);; Alla filer (*)</translation> </message> <message> <location filename="../MainUI.cpp" line="341"/> <location filename="../MainUI.cpp" line="343"/> <source> Folders: </source> - <translation> Mappar:</translation> + <translation> Mappar: </translation> </message> <message> <location filename="../MainUI.cpp" line="341"/> @@ -221,7 +221,7 @@ <message> <location filename="../MainUI.cpp" line="343"/> <source> Calculating...</source> - <translation> Beräknar...</translation> + <translation> Beräknar...</translation> </message> </context> </TS> diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_da.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_da.ts index cefef3c8..54c2d356 100644 --- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_da.ts +++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_da.ts @@ -331,8 +331,8 @@ </message> <message> <location filename="../widgets/DirWidget2.cpp" line="462"/> - <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source> - <translation>Kunne ikke finde "lumina-fileinfo"-redskabet på systemet. Installér det venligst først.</translation> + <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source> + <translation>Kunne ikke finde "lumina-fileinfo"-redskabet på systemet. Installér det venligst først.</translation> </message> <message> <location filename="../widgets/DirWidget2.cpp" line="488"/> @@ -566,8 +566,8 @@ Ny placering: %2</translation> </message> <message> <location filename="../gitWizard.ui" line="232"/> - <source>Click "Next" to start downloading the repository</source> - <translation>Klik på "Næste" for at starte download af arkivet</translation> + <source>Click "Next" to start downloading the repository</source> + <translation>Klik på "Næste" for at starte download af arkivet</translation> </message> <message> <location filename="../gitWizard.h" line="58"/> @@ -1168,7 +1168,7 @@ Ny placering: %2</translation> <message> <location filename="../TrayUI.cpp" line="91"/> <source>New Tasks Running</source> - <translation type="unfinished"></translation> + <translation>Nye opgaver kører</translation> </message> </context> </TS> diff --git a/src-qt5/desktop-utils/lumina-notify/README.md b/src-qt5/desktop-utils/lumina-notify/README.md new file mode 100644 index 00000000..ea71b0f4 --- /dev/null +++ b/src-qt5/desktop-utils/lumina-notify/README.md @@ -0,0 +1,33 @@ +### lumina-notify + +This is a simple application for launching QDialogs from shell. + +Use: + +lumina-notify arg1 arg2 arg3 arg4 + +* arg1 = Message Text +* arg2 = Button Text (Accept Role) +* arg3 = Button Text (Reject Role) +* arg4 = Window Title + +For multiple word arguments encapsulate them with "s + +*** +Example usage in shell script +*** + +~~~~ +#!/bin/csh +set a=`./lumina-notify "Did Jar Jar do anything wrong?" Yes No "Question"` +if ($a == 1) then +set b=`./lumina-notify "Are you sure?" Yes No "Are you Sure?"` +if ($b == 1) then +./lumina-notify "Please stop being a hater." Ok Ok "Haters gunna hate" +else +set c=`./lumina-notify "Thank you for changing your mind" OK OK "You're Awesome"` +endif +else +./lumina-notify "High Five for Darth Jar Jar" Sure OK "Respect" +endif` +~~~~ diff --git a/src-qt5/desktop-utils/lumina-notify/lumina-notify.pro b/src-qt5/desktop-utils/lumina-notify/lumina-notify.pro index 8b1317d7..7aa09583 100644 --- a/src-qt5/desktop-utils/lumina-notify/lumina-notify.pro +++ b/src-qt5/desktop-utils/lumina-notify/lumina-notify.pro @@ -2,15 +2,18 @@ # Created by q5sys # Released under MIT License 2017-03-08 #------------------------------------------------- +include($${PWD}/../../OS-detect.pri) QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = qnotify +TARGET = lumina-notify +target.path = $${L_BINDIR} TEMPLATE = app DEFINES += QT_DEPRECATED_WARNINGS SOURCES += main.cpp +INSTALLS += target desktop diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_da.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_da.ts index 63cc86c5..af47ae29 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_da.ts +++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_da.ts @@ -94,7 +94,7 @@ <message> <location filename="../MainUI.ui" line="433"/> <source>Select Area</source> - <translation type="unfinished"></translation> + <translation>Vælg område</translation> </message> <message> <location filename="../MainUI.ui" line="445"/> diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts index b79759a8..df44c4fd 100644 --- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts +++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts @@ -45,7 +45,7 @@ <message> <location filename="../DnDTabBar.h" line="43"/> <source>Detach Tab</source> - <translation type="unfinished"></translation> + <translation>Løsriv faneblad</translation> </message> </context> <context> @@ -122,7 +122,7 @@ <message> <location filename="../MainUI.ui" line="220"/> <source>Tabs Location</source> - <translation type="unfinished"></translation> + <translation>Fanebladsplacering</translation> </message> <message> <location filename="../MainUI.ui" line="237"/> @@ -244,22 +244,22 @@ <message> <location filename="../MainUI.ui" line="409"/> <source>Top</source> - <translation type="unfinished"></translation> + <translation>Øverst</translation> </message> <message> <location filename="../MainUI.ui" line="417"/> <source>Bottom</source> - <translation type="unfinished"></translation> + <translation>Nederst</translation> </message> <message> <location filename="../MainUI.ui" line="425"/> <source>Left</source> - <translation type="unfinished"></translation> + <translation>Venstre</translation> </message> <message> <location filename="../MainUI.ui" line="433"/> <source>Right</source> - <translation type="unfinished"></translation> + <translation>Højre</translation> </message> <message> <location filename="../MainUI.cpp" line="61"/> |