diff options
| -rw-r--r-- | src-qt5/core/libLumina/LuminaXDG.cpp | 54 | ||||
| -rw-r--r-- | src-qt5/core/libLumina/LuminaXDG.h | 19 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ru.ts | 102 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-terminal/i18n/l-terminal_ru.ts | 30 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts | 138 |
5 files changed, 176 insertions, 167 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index 48185a38..36b05676 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -20,6 +20,7 @@ XDGDesktopList::XDGDesktopList(QObject *parent, bool watchdirs) : QObject(parent synctimer = new QTimer(this); synctimer->setInterval(60000); //1 minute intervals. since the polling/update only takes a few ms, this is completely reasonable connect(synctimer, SIGNAL(timeout()), this, SLOT(updateList()) ); + keepsynced = watchdirs; if(watchdirs){ watcher = new QFileSystemWatcher(this); connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(watcherChanged()) ); @@ -47,7 +48,7 @@ void XDGDesktopList::updateList(){ bool firstrun = lastCheck.isNull() || oldkeys.isEmpty(); lastCheck = QDateTime::currentDateTime(); //Variables for internal loop use only (to prevent re-initializing variable on every iteration) - bool ok; QString path; QDir dir; QStringList apps; XDGDesktop dFile; + bool ok; QString path; QDir dir; QStringList apps; for(int i=0; i<appDirs.length(); i++){ if( !dir.cd(appDirs[i]) ){ continue; } //could not open dir for some reason apps = dir.entryList(QStringList() << "*.desktop",QDir::Files, QDir::Name); @@ -55,36 +56,40 @@ void XDGDesktopList::updateList(){ path = dir.absoluteFilePath(apps[a]); if(files.contains(path) && (files.value(path).lastRead>QFileInfo(path).lastModified()) ){ //Re-use previous data for this file (nothing changed) - dFile = files[path]; + found << files[path].name; //keep track of which files were already found ok=true; }else{ ok=false; - dFile = LXDG::loadDesktopFile(path,ok); //will change the "ok" variable as needed - appschanged = true; //flag that something changed - needed to load a file - } - if(ok && !found.contains(dFile.name)){ - if(!oldkeys.contains(path)){ newfiles << path; } //brand new file (not an update to a previously-read file) - files.insert(path, dFile); - found << dFile.name; - oldkeys.removeAll(path); //make sure this key does not get cleaned up later + if(files.contains(path)){ appschanged = true; files.remove(path); } + XDGDesktop dFile = LXDG::loadDesktopFile(path,ok); //will change the "ok" variable as needed + if(ok){ + appschanged = true; //flag that something changed - needed to load a file + if(!oldkeys.contains(path)){ newfiles << path; } //brand new file (not an update to a previously-read file) + files.insert(path, dFile); + found << dFile.name; + } } + oldkeys.removeAll(path); //make sure this key does not get cleaned up later } //end loop over apps } //end loop over appDirs //Save the extra info to the internal lists - if(!firstrun){ removedApps = oldkeys; }//files which were removed - if(!firstrun){ newApps = newfiles; }//files which were added + if(!firstrun){ + removedApps = oldkeys;//files which were removed + newApps = newfiles; //files which were added + } //Now go through and cleanup any old keys where the associated file does not exist anymore for(int i=0; i<oldkeys.length(); i++){ + //qDebug() << "Removing file from internal map:" << oldkeys[i]; files.remove(oldkeys[i]); } //If this class is automatically managing the lists, update the watched files/dirs and send out notifications if(watcher!=0){ - //qDebug() << "App List Updated:" << lastCheck << appschanged << newfiles << oldkeys; + qDebug() << "Auto App List Update:" << lastCheck << "Changes:" << appschanged << "Files:" << files.count(); watcher->removePaths(QStringList() << watcher->files() << watcher->directories()); watcher->addPaths(appDirs); if(appschanged){ emit appsUpdated(); } + synctimer->start(); } - synctimer->start(); } QList<XDGDesktop> XDGDesktopList::apps(bool showAll, bool showHidden){ @@ -92,8 +97,8 @@ QList<XDGDesktop> XDGDesktopList::apps(bool showAll, bool showHidden){ QStringList keys = files.keys(); QList<XDGDesktop> out; for(int i=0; i<keys.length(); i++){ - if( LXDG::checkValidity(files[keys[i]], showAll) ){ - if( showHidden || !files[keys[i]].isHidden ){ + if( showHidden || !files[keys[i]].isHidden ){ //this is faster than the "checkValidity()" function below - so always filter here first + if( LXDG::checkValidity(files[keys[i]], showAll) ){ out << files[keys[i]]; } } @@ -234,7 +239,6 @@ XDGDesktop LXDG::loadDesktopFile(QString filePath, bool& ok){ QString loc = var.section("[",1,1).section("]",0,0).simplified(); // localization var = var.section("[",0,0).simplified(); //remove the localization QString val = line.section("=",1,50).simplified(); - //if(filePath.contains("pcbsd")){ qDebug() << " -- " << var << val << loc; } //------------------- if(var=="Name"){ if(insection){ @@ -295,17 +299,10 @@ XDGDesktop LXDG::loadDesktopFile(QString filePath, bool& ok){ //hasType = true; } } //end reading file - //file.close(); + file.clear(); //done with contents of file //If there are OnlyShowIn desktops listed, add them to the name if( !DF.showInList.isEmpty() && !DF.showInList.contains("Lumina", Qt::CaseInsensitive) ){ - /*QStringList added; - //Need to be careful about case insensitivity here - the QList functions don't understand it - for(int i=0; i<DF.showInList.length(); i++){ - if(DF.showInList[i].toLower()!="lumina"){ added << DF.showInList[i]; } - }*/ - //if(!added.isEmpty()){ DF.name.append(" ("+DF.showInList.join(", ")+")"); - //} } //Quick fix for showing "wine" applications (which quite often don't list a category, or have other differences) if(DF.catList.isEmpty() && filePath.contains("/wine/")){ @@ -325,7 +322,6 @@ XDGDesktop LXDG::loadDesktopFile(QString filePath, bool& ok){ } } //Return the structure - //if (hasName && hasType) ok = true; //without Name and Type, the structure cannot be a valid .desktop file ok = true; //was able to open/read the file - validity determined later return DF; } @@ -511,15 +507,15 @@ QStringList LXDG::systemApplicationDirs(){ } XDGDesktopList* LXDG::systemAppsList(){ - static XDGDesktopList *sysapps = new XDGDesktopList(0,true); //set this to automatically update as needed + static XDGDesktopList *sysapps = 0; + if(sysapps == 0){ qDebug() << "Generating new apps list"; sysapps = new XDGDesktopList(0,true); }//set this to automatically update as needed if(sysapps->lastCheck.isNull()){ sysapps->updateList(); } //catch the first time the class was used, and prompt for an update right now return sysapps; } QList<XDGDesktop> LXDG::systemDesktopFiles(bool showAll, bool showHidden){ //Quick overload for backwards compatibility which uses the static/global class for managing app entries - XDGDesktopList list(0, false); - return list.apps(showAll, showHidden); + return systemAppsList()->apps(showAll, showHidden); } QHash<QString,QList<XDGDesktop> > LXDG::sortDesktopCats(QList<XDGDesktop> apps){ diff --git a/src-qt5/core/libLumina/LuminaXDG.h b/src-qt5/core/libLumina/LuminaXDG.h index 996e5a20..5c012b9a 100644 --- a/src-qt5/core/libLumina/LuminaXDG.h +++ b/src-qt5/core/libLumina/LuminaXDG.h @@ -35,8 +35,8 @@ // ====================== // FreeDesktop Desktop Actions Framework (data structure) // ====================== -class XDGDesktopAction{ -public: +struct XDGDesktopAction{ +//public: //Admin variables QString ID; //The ID name for this action (should correspond to an entry in the "actionList" for the XDGDesktop below) //General Variables @@ -46,9 +46,10 @@ public: // ====================== // FreeDesktop Desktop Entry Framework (data structure) // ====================== -class XDGDesktop{ -public: +struct XDGDesktop{ +//public: enum XDGDesktopType { BAD, APP, LINK, DIR }; + //Admin variables QString filePath; //which file this structure contains the information for (absolute path) QDateTime lastRead; //when this structure was created from the file @@ -64,10 +65,15 @@ public: QList<XDGDesktopAction> actions; //Type 2 (LINK) variables QString url; - + //Constructor/destructor XDGDesktop(){} - ~XDGDesktop(){} + ~XDGDesktop(){ + actions.clear(); + showInList.clear(); notShowInList.clear(); actionList.clear(); mimeList.clear(); catList.clear(); keyList.clear(); + name.clear(); genericName.clear(); comment.clear(); icon.clear(); + exec.clear(); tryexec.clear(); path.clear(); startupWM.clear(); url.clear(); + } }; // ======================== @@ -93,6 +99,7 @@ public slots: private: QFileSystemWatcher *watcher; QTimer *synctimer; + bool keepsynced; private slots: void watcherChanged(); diff --git a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ru.ts b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ru.ts index 5a0a33e4..81793dfc 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ru.ts +++ b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ru.ts @@ -1,225 +1,225 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <!DOCTYPE TS> <TS version="2.1" language="ru"> <context> <name>MainUI</name> <message> - <location filename="../MainUI.ui" line="14"/> - <location filename="../MainUI.ui" line="24"/> - <location filename="../MainUI.cpp" line="89"/> + <location filename="../MainUI.ui" line="14"></location> + <location filename="../MainUI.ui" line="24"></location> + <location filename="../MainUI.cpp" line="89"></location> <source>File Information</source> <translation>Информация о Файле</translation> </message> <message> - <location filename="../MainUI.ui" line="56"/> + <location filename="../MainUI.ui" line="56"></location> <source>Owner:</source> <translation>Владелец:</translation> </message> <message> - <location filename="../MainUI.ui" line="73"/> + <location filename="../MainUI.ui" line="73"></location> <source>Group:</source> <translation>Группа:</translation> </message> <message> - <location filename="../MainUI.ui" line="90"/> + <location filename="../MainUI.ui" line="90"></location> <source>Permissions:</source> <translation>Разрешения:</translation> </message> <message> - <location filename="../MainUI.ui" line="104"/> + <location filename="../MainUI.ui" line="104"></location> <source>Created:</source> <translation>Созданный:</translation> </message> <message> - <location filename="../MainUI.ui" line="111"/> + <location filename="../MainUI.ui" line="111"></location> <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>Примечание: время создания файла может быть более позднее, чем время изменения, если права на файл были недавно изменены.</translation> </message> <message> - <location filename="../MainUI.ui" line="124"/> + <location filename="../MainUI.ui" line="124"></location> <source>Last Modified:</source> <translation>Последнее изменение:</translation> </message> <message> - <location filename="../MainUI.ui" line="131"/> + <location filename="../MainUI.ui" line="131"></location> <source>Type:</source> <translation>Тип:</translation> </message> <message> - <location filename="../MainUI.ui" line="138"/> + <location filename="../MainUI.ui" line="138"></location> <source>MimeType:</source> <translation>MIME-тип:</translation> </message> <message> - <location filename="../MainUI.ui" line="185"/> + <location filename="../MainUI.ui" line="185"></location> <source>File Size:</source> <translation>Размер файла:</translation> </message> <message> - <location filename="../MainUI.ui" line="216"/> - <location filename="../MainUI.cpp" line="130"/> + <location filename="../MainUI.ui" line="216"></location> + <location filename="../MainUI.cpp" line="130"></location> <source>Edit Shortcut</source> <translation>Изменить ссылку</translation> </message> <message> - <location filename="../MainUI.ui" line="239"/> + <location filename="../MainUI.ui" line="239"></location> <source>Working Dir:</source> <translation>Рабочий каталог:</translation> </message> <message> - <location filename="../MainUI.ui" line="246"/> + <location filename="../MainUI.ui" line="246"></location> <source>Use startup notification</source> <translation>Уведомление</translation> </message> <message> - <location filename="../MainUI.ui" line="260"/> + <location filename="../MainUI.ui" line="260"></location> <source>Icon:</source> <translation>Иконка:</translation> </message> <message> - <location filename="../MainUI.ui" line="267"/> + <location filename="../MainUI.ui" line="267"></location> <source>Command:</source> <translation>Команда:</translation> </message> <message> - <location filename="../MainUI.ui" line="274"/> + <location filename="../MainUI.ui" line="274"></location> <source>Comment:</source> <translation>Комментарий:</translation> </message> <message> - <location filename="../MainUI.ui" line="284"/> + <location filename="../MainUI.ui" line="284"></location> <source>Run in terminal</source> <translation>Запуск в терминале</translation> </message> <message> - <location filename="../MainUI.ui" line="291"/> + <location filename="../MainUI.ui" line="291"></location> <source>Name:</source> <translation>Имя:</translation> </message> <message> - <location filename="../MainUI.ui" line="298"/> + <location filename="../MainUI.ui" line="298"></location> <source>Options</source> <translation>Опции</translation> </message> <message> - <location filename="../MainUI.ui" line="336"/> + <location filename="../MainUI.ui" line="336"></location> <source>No Icon</source> <translation>Нет иконки</translation> </message> <message> - <location filename="../MainUI.ui" line="392"/> + <location filename="../MainUI.ui" line="392"></location> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../MainUI.ui" line="405"/> + <location filename="../MainUI.ui" line="405"></location> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../MainUI.cpp" line="59"/> + <location filename="../MainUI.cpp" line="59"></location> <source>---Calculating---</source> <translation>---Вычисление---</translation> </message> <message> - <location filename="../MainUI.cpp" line="68"/> + <location filename="../MainUI.cpp" line="68"></location> <source>Read/Write</source> <translation>Чтение/Запись</translation> </message> <message> - <location filename="../MainUI.cpp" line="69"/> + <location filename="../MainUI.cpp" line="69"></location> <source>Read Only</source> <translation>Только чтение</translation> </message> <message> - <location filename="../MainUI.cpp" line="70"/> + <location filename="../MainUI.cpp" line="70"></location> <source>Write Only</source> <translation>Только запись</translation> </message> <message> - <location filename="../MainUI.cpp" line="71"/> + <location filename="../MainUI.cpp" line="71"></location> <source>No Access</source> <translation>Нет доступа</translation> </message> <message> - <location filename="../MainUI.cpp" line="75"/> + <location filename="../MainUI.cpp" line="75"></location> <source>XDG Shortcut</source> <translation>XDG ссылка</translation> </message> <message> - <location filename="../MainUI.cpp" line="76"/> + <location filename="../MainUI.cpp" line="76"></location> <source>Directory</source> <translation>Папка</translation> </message> <message> - <location filename="../MainUI.cpp" line="77"/> + <location filename="../MainUI.cpp" line="77"></location> <source>Binary</source> <translation>Бинарный</translation> </message> <message> - <location filename="../MainUI.cpp" line="79"/> + <location filename="../MainUI.cpp" line="79"></location> <source>Hidden %1</source> <translation>Скрытый %1</translation> </message> <message> - <location filename="../MainUI.cpp" line="116"/> + <location filename="../MainUI.cpp" line="116"></location> <source>URL:</source> <translation>URL:</translation> </message> <message> - <location filename="../MainUI.cpp" line="237"/> + <location filename="../MainUI.cpp" line="237"></location> <source>Save Application File</source> - <translation type="unfinished"></translation> + <translation>Сохранить файл приложения</translation> </message> <message> - <location filename="../MainUI.cpp" line="237"/> + <location filename="../MainUI.cpp" line="237"></location> <source>Application Registrations (*.desktop)</source> - <translation type="unfinished"></translation> + <translation>Регистрация приложения (* .desktop)</translation> </message> <message> - <location filename="../MainUI.cpp" line="278"/> + <location filename="../MainUI.cpp" line="278"></location> <source>Select a binary</source> <translation>Выбрать бинарный</translation> </message> <message> - <location filename="../MainUI.cpp" line="281"/> + <location filename="../MainUI.cpp" line="281"></location> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../MainUI.cpp" line="281"/> + <location filename="../MainUI.cpp" line="281"></location> <source>Invalid selection: Not a valid executable</source> <translation>Неверный выбор: Не является выполняемым</translation> </message> <message> - <location filename="../MainUI.cpp" line="293"/> + <location filename="../MainUI.cpp" line="293"></location> <source>Select a directory</source> <translation>Выбрать каталог</translation> </message> <message> - <location filename="../MainUI.cpp" line="306"/> + <location filename="../MainUI.cpp" line="306"></location> <source>Select an icon</source> <translation>Выбрать иконку</translation> </message> <message> - <location filename="../MainUI.cpp" line="306"/> + <location filename="../MainUI.cpp" line="306"></location> <source>Images (%1);; All Files (*)</source> <translation>Изображений (%1);; Все файлы (*)</translation> </message> <message> - <location filename="../MainUI.cpp" line="329"/> - <location filename="../MainUI.cpp" line="331"/> + <location filename="../MainUI.cpp" line="329"></location> + <location filename="../MainUI.cpp" line="331"></location> <source> Folders: </source> <translation> Папки: </translation> </message> <message> - <location filename="../MainUI.cpp" line="329"/> - <location filename="../MainUI.cpp" line="331"/> + <location filename="../MainUI.cpp" line="329"></location> + <location filename="../MainUI.cpp" line="331"></location> <source>Files: </source> <translation>Файлы: </translation> </message> <message> - <location filename="../MainUI.cpp" line="331"/> + <location filename="../MainUI.cpp" line="331"></location> <source> Calculating...</source> <translation> Вычисление...</translation> </message> diff --git a/src-qt5/desktop-utils/lumina-terminal/i18n/l-terminal_ru.ts b/src-qt5/desktop-utils/lumina-terminal/i18n/l-terminal_ru.ts index 72ca44df..6fa3012b 100644 --- a/src-qt5/desktop-utils/lumina-terminal/i18n/l-terminal_ru.ts +++ b/src-qt5/desktop-utils/lumina-terminal/i18n/l-terminal_ru.ts @@ -1,45 +1,45 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <!DOCTYPE TS> <TS version="2.1" language="ru_RU"> <context> <name>TerminalWidget</name> <message> - <location filename="../TerminalWidget.cpp" line="50"/> + <location filename="../TerminalWidget.cpp" line="50"></location> <source>Copy Selection</source> - <translation type="unfinished"></translation> + <translation>Копировать выбранное</translation> </message> <message> - <location filename="../TerminalWidget.cpp" line="51"/> + <location filename="../TerminalWidget.cpp" line="51"></location> <source>Paste</source> - <translation type="unfinished"></translation> + <translation>Вставить</translation> </message> </context> <context> <name>TrayIcon</name> <message> - <location filename="../TrayIcon.cpp" line="123"/> + <location filename="../TrayIcon.cpp" line="123"></location> <source>Trigger Terminal</source> - <translation type="unfinished"></translation> + <translation>Запуск терминала</translation> </message> <message> - <location filename="../TrayIcon.cpp" line="125"/> + <location filename="../TrayIcon.cpp" line="125"></location> <source>Top of Screen</source> - <translation type="unfinished"></translation> + <translation>Всегда наверху</translation> </message> <message> - <location filename="../TrayIcon.cpp" line="130"/> + <location filename="../TrayIcon.cpp" line="130"></location> <source>Close Terminal</source> - <translation type="unfinished"></translation> + <translation>Закрыть терминал</translation> </message> <message> - <location filename="../TrayIcon.cpp" line="139"/> + <location filename="../TrayIcon.cpp" line="139"></location> <source>Move To Monitor</source> - <translation type="unfinished"></translation> + <translation>Переместить на экран</translation> </message> <message> - <location filename="../TrayIcon.cpp" line="142"/> + <location filename="../TrayIcon.cpp" line="142"></location> <source>Monitor %1</source> - <translation type="unfinished"></translation> + <translation>Экран: %1</translation> </message> </context> </TS> diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts index a8c8e491..04aab764 100644 --- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts +++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts @@ -1,41 +1,41 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <!DOCTYPE TS> <TS version="2.1" language="ru"> <context> <name>ColorDialog</name> <message> - <location filename="../ColorDialog.ui" line="14"/> + <location filename="../ColorDialog.ui" line="14"></location> <source>Customize Colors</source> <translation>Настройка цвета</translation> </message> <message> - <location filename="../ColorDialog.ui" line="24"/> + <location filename="../ColorDialog.ui" line="24"></location> <source>Item Type</source> <translation>Тип элемента</translation> </message> <message> - <location filename="../ColorDialog.ui" line="29"/> + <location filename="../ColorDialog.ui" line="29"></location> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../ColorDialog.ui" line="34"/> + <location filename="../ColorDialog.ui" line="34"></location> <source>Sample</source> <translation>Пример</translation> </message> <message> - <location filename="../ColorDialog.ui" line="44"/> - <location filename="../ColorDialog.cpp" line="55"/> + <location filename="../ColorDialog.ui" line="44"></location> + <location filename="../ColorDialog.cpp" line="55"></location> <source>Select Color</source> <translation>Выбор цвета</translation> </message> <message> - <location filename="../ColorDialog.ui" line="64"/> + <location filename="../ColorDialog.ui" line="64"></location> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../ColorDialog.ui" line="71"/> + <location filename="../ColorDialog.ui" line="71"></location> <source>Apply</source> <translation>Применить</translation> </message> @@ -43,252 +43,258 @@ <context> <name>MainUI</name> <message> - <location filename="../MainUI.ui" line="14"/> + <location filename="../MainUI.ui" line="14"></location> <source>MainWindow</source> <translation>Главное окно</translation> </message> <message> - <location filename="../MainUI.ui" line="46"/> + <location filename="../MainUI.ui" line="46"></location> <source>Tab 1</source> <translation>Вкладка 1</translation> </message> <message> - <location filename="../MainUI.ui" line="81"/> + <location filename="../MainUI.ui" line="81"></location> <source>Find the previous match</source> <translation>Найти предыдущее совпадение</translation> </message> <message> - <location filename="../MainUI.ui" line="84"/> - <location filename="../MainUI.ui" line="97"/> - <location filename="../MainUI.ui" line="148"/> - <location filename="../MainUI.ui" line="161"/> - <location filename="../MainUI.ui" line="173"/> + <location filename="../MainUI.ui" line="84"></location> + <location filename="../MainUI.ui" line="97"></location> + <location filename="../MainUI.ui" line="148"></location> + <location filename="../MainUI.ui" line="161"></location> + <location filename="../MainUI.ui" line="173"></location> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../MainUI.ui" line="183"/> + <location filename="../MainUI.ui" line="183"></location> <source>Find:</source> <translation>Найти:</translation> </message> <message> - <location filename="../MainUI.ui" line="94"/> + <location filename="../MainUI.ui" line="94"></location> <source>Find the next match</source> <translation>Найти следующее совпадение</translation> </message> <message> - <location filename="../MainUI.ui" line="104"/> + <location filename="../MainUI.ui" line="104"></location> <source>Replace:</source> <translation>Заменить:</translation> </message> <message> - <location filename="../MainUI.ui" line="123"/> + <location filename="../MainUI.ui" line="123"></location> <source>Match case</source> <translation>Учитывать регистр</translation> </message> <message> - <location filename="../MainUI.ui" line="145"/> + <location filename="../MainUI.ui" line="145"></location> <source>Replace next match</source> <translation>Заменить следующее совпадение</translation> </message> <message> - <location filename="../MainUI.ui" line="158"/> + <location filename="../MainUI.ui" line="158"></location> <source>Replace all matches (to end of document)</source> <translation>Заменить все совпадения (до конца документа)</translation> </message> <message> - <location filename="../MainUI.ui" line="170"/> + <location filename="../MainUI.ui" line="170"></location> <source>Hide the find/replace options</source> <translation>Скрыть опции поиска/замены</translation> </message> <message> - <location filename="../MainUI.ui" line="208"/> + <location filename="../MainUI.ui" line="208"></location> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../MainUI.ui" line="221"/> + <location filename="../MainUI.ui" line="221"></location> <source>View</source> <translation>Просмотр</translation> </message> <message> - <location filename="../MainUI.ui" line="225"/> + <location filename="../MainUI.ui" line="225"></location> <source>Syntax Highlighting</source> <translation>Подсветка синтаксиса</translation> </message> <message> - <location filename="../MainUI.ui" line="238"/> + <location filename="../MainUI.ui" line="238"></location> <source>Edit</source> <translation>Правка</translation> </message> <message> - <location filename="../MainUI.ui" line="253"/> + <location filename="../MainUI.ui" line="253"></location> <source>toolBar</source> <translation>Панель инструментов</translation> </message> <message> - <location filename="../MainUI.ui" line="279"/> + <location filename="../MainUI.ui" line="279"></location> <source>Show Line Numbers</source> <translation>Показать номера строк</translation> </message> <message> - <location filename="../MainUI.ui" line="284"/> + <location filename="../MainUI.ui" line="284"></location> <source>None</source> <translation>Ничего</translation> </message> <message> - <location filename="../MainUI.ui" line="289"/> - <location filename="../MainUI.cpp" line="147"/> + <location filename="../MainUI.ui" line="289"></location> + <location filename="../MainUI.cpp" line="147"></location> <source>New File</source> <translation>Новый файл</translation> </message> <message> - <location filename="../MainUI.ui" line="292"/> + <location filename="../MainUI.ui" line="292"></location> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../MainUI.ui" line="300"/> + <location filename="../MainUI.ui" line="300"></location> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../MainUI.ui" line="303"/> + <location filename="../MainUI.ui" line="303"></location> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../MainUI.ui" line="311"/> + <location filename="../MainUI.ui" line="311"></location> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../MainUI.ui" line="314"/> + <location filename="../MainUI.ui" line="314"></location> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../MainUI.ui" line="322"/> + <location filename="../MainUI.ui" line="322"></location> <source>Save File As</source> <translation>Сохранить файл как</translation> </message> <message> - <location filename="../MainUI.ui" line="327"/> + <location filename="../MainUI.ui" line="327"></location> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../MainUI.ui" line="330"/> + <location filename="../MainUI.ui" line="330"></location> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../MainUI.ui" line="338"/> + <location filename="../MainUI.ui" line="338"></location> <source>Close File</source> <translation>Закрыть файл</translation> </message> <message> - <location filename="../MainUI.ui" line="341"/> + <location filename="../MainUI.ui" line="341"></location> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../MainUI.ui" line="349"/> + <location filename="../MainUI.ui" line="349"></location> <source>Customize Colors</source> <translation>Настройка цвета</translation> </message> <message> - <location filename="../MainUI.ui" line="360"/> + <location filename="../MainUI.ui" line="360"></location> <source>Wrap Lines</source> <translation>Переносить строки</translation> </message> <message> - <location filename="../MainUI.ui" line="365"/> + <location filename="../MainUI.ui" line="365"></location> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../MainUI.ui" line="368"/> + <location filename="../MainUI.ui" line="368"></location> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../MainUI.ui" line="376"/> + <location filename="../MainUI.ui" line="376"></location> <source>Replace</source> <translation>Заменить</translation> </message> <message> - <location filename="../MainUI.ui" line="379"/> + <location filename="../MainUI.ui" line="379"></location> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../MainUI.cpp" line="40"/> + <location filename="../MainUI.cpp" line="40"></location> <source>Text Editor</source> <translation>Текстовый редактор</translation> </message> <message> - <location filename="../MainUI.cpp" line="154"/> + <location filename="../MainUI.cpp" line="154"></location> <source>Open File(s)</source> <translation>Открыть файл(ы)</translation> </message> <message> - <location filename="../MainUI.cpp" line="154"/> + <location filename="../MainUI.cpp" line="154"></location> <source>Text Files (*)</source> <translation>Текстовые файлы (*)</translation> </message> <message> - <location filename="../MainUI.cpp" line="283"/> - <location filename="../MainUI.cpp" line="380"/> + <location filename="../MainUI.cpp" line="283"></location> + <location filename="../MainUI.cpp" line="380"></location> <source>Lose Unsaved Changes?</source> - <translation type="unfinished"></translation> + <translation>Потерять несохраненные изменения?</translation> </message> <message> - <location filename="../MainUI.cpp" line="283"/> + <location filename="../MainUI.cpp" line="283"></location> <source>This file has unsaved changes. Do you want to close it anyway? %1</source> - <translation type="unfinished"></translation> + <translation>Этот файл содержит несохраненные изменения. +Вы все равно хотите его закрыть? + +%1</translation> </message> <message> - <location filename="../MainUI.cpp" line="380"/> + <location filename="../MainUI.cpp" line="380"></location> <source>There are unsaved changes. Do you want to close the editor anyway? %1</source> - <translation type="unfinished"></translation> + <translation>Есть несохраненные изменения. +Вы все равно хотите закрыть редактор? + +%1</translation> </message> </context> <context> <name>PlainTextEditor</name> <message> - <location filename="../PlainTextEditor.cpp" line="94"/> + <location filename="../PlainTextEditor.cpp" line="94"></location> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../PlainTextEditor.cpp" line="94"/> + <location filename="../PlainTextEditor.cpp" line="94"></location> <source>Text File (*)</source> <translation>Текстовые файлы (*)</translation> </message> <message> - <location filename="../PlainTextEditor.cpp" line="289"/> + <location filename="../PlainTextEditor.cpp" line="289"></location> <source>Row Number: %1, Column Number: %2</source> - <translation type="unfinished"></translation> + <translation>Номер строки: %1, Номер колонки: %2</translation> </message> <message> - <location filename="../PlainTextEditor.cpp" line="298"/> + <location filename="../PlainTextEditor.cpp" line="298"></location> <source>The following file has been changed by some other utility. Do you want to re-load it?</source> <translation>Следующий файл был изменен с помощью какой-либо другой утилиты. Вы хотите, повторно загрузить его?</translation> </message> <message> - <location filename="../PlainTextEditor.cpp" line="300"/> + <location filename="../PlainTextEditor.cpp" line="300"></location> <source>(Note: You will lose all currently-unsaved changes)</source> <translation>(Примечание: Вы потеряете все несохраненные изменения)</translation> </message> <message> - <location filename="../PlainTextEditor.cpp" line="304"/> + <location filename="../PlainTextEditor.cpp" line="304"></location> <source>File Modified</source> <translation>Файл изменен</translation> </message> |