From a50b02ad23306a963d2d503b21127262a2ee8a8c Mon Sep 17 00:00:00 2001 From: Mattia Basaglia Date: Sat, 9 Nov 2013 22:30:44 +0100 Subject: [PATCH 1/2] Fix project file for OSX --- data/translations/knotter_cs.ts | 280 ++++++++++++++++------------- data/translations/knotter_en_GB.ts | 280 ++++++++++++++++------------- data/translations/knotter_it.ts | 244 ++++++++++++++----------- data/translations/knotter_ru.ts | 280 ++++++++++++++++------------- knotter.pro | 10 +- knotter_info.pri | 2 +- man/knotter.1.gz | Bin 558 -> 560 bytes 7 files changed, 608 insertions(+), 488 deletions(-) diff --git a/data/translations/knotter_cs.ts b/data/translations/knotter_cs.ts index 9e9d3ce..c69bff8 100644 --- a/data/translations/knotter_cs.ts +++ b/data/translations/knotter_cs.ts @@ -561,10 +561,42 @@ p, li { white-space: pre-wrap; } Odstranit - + Add + + + Spiral + + + + + End Angle + + + + + + + ° + ° + + + + Start Angle + + + + + Turning Size + + + + + Angle Step + + Fill Area @@ -645,38 +677,6 @@ p, li { white-space: pre-wrap; } Mirror Y - - - Spiral - - - - - End Angle - - - - - - - ° - ° - - - - Start Angle - - - - - Turning Size - - - - - Angle Step - - Dialog_Confirm_Close @@ -784,7 +784,7 @@ p, li { white-space: pre-wrap; } - + Disabled Zakázáno @@ -814,17 +814,27 @@ p, li { white-space: pre-wrap; } Hodnota - + + View &Settings... + + + + + C&lear Settings + + + + No plugin installed Žádný přídavný modul není nainstalován - + &Reload Plugins &Nahrát přídavné moduly znovu - + &Create... &Vytvořit... @@ -833,7 +843,7 @@ p, li { white-space: pre-wrap; } &Instalovat... - + &OK &OK @@ -850,12 +860,12 @@ p, li { white-space: pre-wrap; } Zavřít - + All - + Enabled Povoleno @@ -2181,82 +2191,82 @@ p, li { white-space: pre-wrap; } &Ukončit - + &Copy &Kopírovat - + &Paste &Vložit - + Cu&t Vyj&mout - + Select &All Vybrat &vše - + &Preferences... &Nastavení... - + &Reset View Nastavit po&hled znovu - + Zoom &In &Přiblížit - + Zoom &Out &Oddálit - + &Reset Zoom Nastavit &zvětšení znovu - + Ctrl+0 Ctrl+0 - + Display &Graph Zobrazit &graf - + &Select &Vybrat - + Edge &Chain Ř&etězec oblouku - + Report &Bugs... Nahlásit &chyby... - + &Fit View &Přizpůsobit zobrazení - + Scroll and zoom the view to display the entire knot Pohybovat a přiblížit pohled tak, aby byl zobrazen celý uzel @@ -2276,57 +2286,57 @@ p, li { white-space: pre-wrap; } Ná&hled tisku... - + &Connect &Připojit - + F F - + &Disconnect &Odpojit - + &Horizontal Flip Vo&dorovné převrácení - + &Vertical Flip Sv&islé převrácení - + &Rotate O&točit - + &Scale &Změnit velikost - + &Merge &Sloučit - + Ctrl+M Ctrl+M - + &Erase &Vymazat - + Del Delete @@ -2335,7 +2345,7 @@ p, li { white-space: pre-wrap; } &Upravit graf - + Alt+Shift+E Alt+Shift+E @@ -2344,12 +2354,12 @@ p, li { white-space: pre-wrap; } Olemovat &smyčku - + Alt+Shift+L Alt+Shift+L - + &Toggle Edges &Přepnout okraje @@ -2358,62 +2368,62 @@ p, li { white-space: pre-wrap; } Vložit mnohoú&helník... - + &Refresh Path &Obnovit cestu - + &Manual Přír&učka - + &About Knotter... &O programu Knotter... - + Select Connected Vybrat spojený - + Ctrl+L Ctrl+L - + &Enable Grid Povo&lit mřížku - + E&xport... &Vyvést... - + Ctrl+E Ctrl+E - + Snap to &Grid &Přichytávat k mřížce - + &Undo &Zpět - + &Redo &Znovu - + &Configure Plugins... &Nastavit přídavné moduly... @@ -2431,17 +2441,17 @@ p, li { white-space: pre-wrap; } Styl výběru - + Action History Historie činností - + Selected Nodes Vybrané uzly - + Selected Edges Vybrané oblouky @@ -2450,22 +2460,22 @@ p, li { white-space: pre-wrap; } Výchozí styl - + Warning: Varování: - + Discarding old configuration Zahodit staré nastavení - + Load old configuration Nahrát staré nastavení - + Knotter has detected configuration for version %1, this is version %2. Do you want to load it anyways? @@ -2474,78 +2484,78 @@ toto je verze %2. Přesto je chcete nahrát? - - + + New Knot Nový keltský uzel - + %1 - %2%3 Main window title * %1 is the program name * %2 is the file name * %3 is a star * or an empty string depending on whether the file was modified %1 - %2%3 - - + + File Error Chyba souboru - + Error while reading "%1". Chyba při čtení "%1". - + Close File Zavřít soubor - + The file "%1" has been modified. Do you want to save changes? Soubor "%1" byl změněn. Chcete uložit změny? - + Undo %1 Zpět %1 - + Redo %1 Znovu %1 - + Open Knot Otevřít keltský uzel - + Knot files (*.knot);;XML files (*.xml);;All files (*) Soubory Knot (*.knot);;Soubory XML (*.xml);;Všechny soubory (*) - + Save Knot Uložit keltský uzel - + Failed to save file "%1". Nepodařilo se uložit soubor "%1". - + (%1,%2) Displaying mouse position, %1 = x, %2 = y (%1,%2) - + No recent files Žádné nedávné soubory @@ -2555,42 +2565,42 @@ Chcete uložit změny? Vložit mnohoúhelník - + Paste Vložit - + Cut Vyjmout - + Drop Upustit - + Snap to Grid Přichytávat k mřížce - + Delete Smazat - + Connect Nodes Spojit uzly - + Disconnect Nodes Odpojit uzly - + Merge Nodes Sloučit uzly @@ -2754,7 +2764,7 @@ Chcete uložit změny? Neznámý typ přídavného modulu - + %1:%2:Error: %3 %1:%2: Chyba: %3 @@ -2793,6 +2803,16 @@ Chcete uložit změny? Error while opening script file %1 Chyba při otevírání souboru se skriptem %1 + + + Expected file name for run_script() + + + + + Cannot open file "%1" + + Remove_Edge @@ -2813,50 +2833,50 @@ Chcete uložit změny? Resource_Manager - + Knotter Knotter - - - + + + Warning: Varování: - + Unrecognised translation file name pattern: %1 Nerozpoznaný vzor názvu souboru s překladem: %1 - + Error on loading translation file %1 for language %2 (%3) %1 is the file name, * %2 is the human-readable language code * %3 is the ISO language code Chyba při nahrávání překladového souboru %1 pro jazyk %2 (%3) - + There is no translation for language %1 (%2) Pro jazyk %1 (%2) není žádný překlad - + Cannot open file - + Unknown error Neznámá chyba - + %1: Error: %2 %1: Chyba: %2 - + Script aborted Vynuceno ukončení skriptu @@ -2878,10 +2898,18 @@ Chcete uložit změny? Nahrát soubor + + Script_QTableWidget + + + Argument is not a QTableWidget object + + + Script_Window_Dialog - + Cancel Zrušit diff --git a/data/translations/knotter_en_GB.ts b/data/translations/knotter_en_GB.ts index 857d9db..b3e226c 100644 --- a/data/translations/knotter_en_GB.ts +++ b/data/translations/knotter_en_GB.ts @@ -2336,10 +2336,42 @@ p, li { white-space: pre-wrap; } Remove - + Add + + + Spiral + + + + + End Angle + + + + + + + ° + ° + + + + Start Angle + + + + + Turning Size + + + + + Angle Step + + Fill Area @@ -2420,38 +2452,6 @@ p, li { white-space: pre-wrap; } Mirror Y - - - Spiral - - - - - End Angle - - - - - - - ° - ° - - - - Start Angle - - - - - Turning Size - - - - - Angle Step - - Dialog_Confirm_Close @@ -2555,7 +2555,7 @@ p, li { white-space: pre-wrap; } - + Disabled @@ -2585,32 +2585,42 @@ p, li { white-space: pre-wrap; } Value - + + View &Settings... + + + + + C&lear Settings + + + + No plugin installed No plug-in installed - + &Reload Plugins &Reload Plug-ins - + &Create... - + &OK &OK - + All - + Enabled @@ -3879,212 +3889,212 @@ p, li { white-space: pre-wrap; } &Exit - + &Copy &Copy - + &Paste &Paste - + Cu&t Cu&t - + Select &All Select &All - + &Preferences... &Preferences... - + &Reset View &Reset View - + Zoom &In Zoom &In - + Zoom &Out Zoom &Out - + &Reset Zoom &Reset Zoom - + Ctrl+0 Ctrl+0 - + Display &Graph Display &Graph - + &Connect &Connect - + F F - + &Disconnect &Disconnect - + &Horizontal Flip &Horizontal Flip - + &Vertical Flip &Vertical Flip - + &Rotate &Rotate - + &Scale &Scale - + &Merge &Merge - + Ctrl+M Ctrl+M - + &Erase &Erase - + Del Del - + &Select - + Alt+Shift+E Alt+Shift+E - + Edge &Chain - + Alt+Shift+L Alt+Shift+L - + &Refresh Path &Refresh Path - + &Manual &Manual - + &About Knotter... &About Knotter... - + E&xport... E&xport... - + Ctrl+E Ctrl+E - + Snap to &Grid Snap to &Grid - + &Undo &Undo - + &Redo &Redo - + &Configure Plugins... &Configure Plug-ins... - + Report &Bugs... Report &Bugs... - + Select Connected Select Connected - + Ctrl+L Ctrl+L - + &Enable Grid &Enable Grid - + &Toggle Edges &Toggle Edges - + &Fit View - + Scroll and zoom the view to display the entire knot @@ -4094,37 +4104,37 @@ p, li { white-space: pre-wrap; } Zoom - + Action History Action History - + Selected Nodes - + Selected Edges - + Warning: Warning: - + Discarding old configuration Discarding old configuration - + Load old configuration Load old configuration - + Knotter has detected configuration for version %1, this is version %2. Do you want to load it anyways? @@ -4133,118 +4143,118 @@ this is version %2. Do you want to load it anyways? - - + + New Knot New Knot - + %1 - %2%3 Main window title * %1 is the program name * %2 is the file name * %3 is a star * or an empty string depending on whether the file was modified %1 - %2%3 - - + + File Error File Error - + Error while reading "%1". Error while reading "%1". - + Close File Close File - + The file "%1" has been modified. Do you want to save changes? The file "%1" has been modified. Do you want to save changes? - + Undo %1 Undo %1 - + Redo %1 Redo %1 - + Open Knot Open Knot - + Knot files (*.knot);;XML files (*.xml);;All files (*) Knot files (*.knot);;XML files (*.xml);;All files (*) - + Save Knot Save Knot - + Failed to save file "%1". Failed to save file "%1". - + (%1,%2) Displaying mouse position, %1 = x, %2 = y (%1,%2) - + No recent files No recent files - + Paste Paste - + Cut Cut - + Drop Drop - + Snap to Grid Snap to Grid - + Delete Delete - + Connect Nodes Connect Nodes - + Disconnect Nodes Disconnect Nodes - + Merge Nodes Merge Nodes @@ -4373,7 +4383,7 @@ Do you want to save changes? Polygonal - + %1:%2:Error: %3 %1:%2:Error: %3 @@ -4417,6 +4427,16 @@ Do you want to save changes? Unknown action %1 Unknown action %1 + + + Expected file name for run_script() + + + + + Cannot open file "%1" + + Remove_Edge @@ -4437,50 +4457,50 @@ Do you want to save changes? Resource_Manager - + Knotter Knotter - - - + + + Warning: Warning: - + Unrecognised translation file name pattern: %1 Unrecognised translation file name pattern: %1 - + Error on loading translation file %1 for language %2 (%3) %1 is the file name, * %2 is the human-readable language code * %3 is the ISO language code Error on loading translation file %1 for language %2 (%3) - + There is no translation for language %1 (%2) There is no translation for language %1 (%2) - + Cannot open file - + Unknown error Unknown error - + %1: Error: %2 %1: Error: %2 - + Script aborted @@ -4498,10 +4518,18 @@ Do you want to save changes? Load File + + Script_QTableWidget + + + Argument is not a QTableWidget object + + + Script_Window_Dialog - + Cancel Cancel diff --git a/data/translations/knotter_it.ts b/data/translations/knotter_it.ts index 94a0246..3e3fde4 100644 --- a/data/translations/knotter_it.ts +++ b/data/translations/knotter_it.ts @@ -439,7 +439,7 @@ p, li { white-space: pre-wrap; } Concentric Frames - Cornici contentriche + Cornici contentriche @@ -448,28 +448,28 @@ p, li { white-space: pre-wrap; } px - + Width - Largezza + Largezza Iterations - Iterazioni + Iterazioni Connected - Connesse + Connesse Delete original selection - Cancella la selezione originale + Cancella la selezione originale @@ -479,7 +479,7 @@ p, li { white-space: pre-wrap; } Name - Nome + Nome @@ -497,7 +497,7 @@ p, li { white-space: pre-wrap; } - + Add @@ -660,12 +660,12 @@ p, li { white-space: pre-wrap; } Insert Polygon - Inserisci poligono + Inserisci poligono Sides - Lati + Lati @@ -683,28 +683,28 @@ p, li { white-space: pre-wrap; } Insert Star - Inserisci lati + Inserisci lati Sides - Lati + Lati Inner Radius - Raggio interno + Raggio interno px - + Outer Radius - Raggio esterno + Raggio esterno @@ -720,7 +720,7 @@ p, li { white-space: pre-wrap; } - + Disabled Disabilita @@ -750,17 +750,27 @@ p, li { white-space: pre-wrap; } Valore - + + View &Settings... + + + + + C&lear Settings + + + + No plugin installed Nessun plugin installato - + &Reload Plugins &Ricarica i Plugin - + &Create... &Crea... @@ -769,17 +779,17 @@ p, li { white-space: pre-wrap; } &Installa... - + &OK &OK - + All Tutti - + Enabled Abilitato @@ -2045,82 +2055,82 @@ p, li { white-space: pre-wrap; } &Esci - + &Copy &Copina - + &Paste &Incolla - + Cu&t &Taglia - + Select &All Selezion&a Tutto - + &Preferences... O&pzioni... - + &Reset View &Reimposta Vista - + Zoom &In &Ingrandisci - + Zoom &Out &Rimpicciolisci - + &Reset Zoom &Reimposta Zoom - + Ctrl+0 - + Display &Graph Mostra &Grafo - + &Select &Selezione - + Edge &Chain &Catena di archi - + Report &Bugs... Segnala Pro&blemi... - + &Fit View A&datta visualizzazione - + Scroll and zoom the view to display the entire knot Muove e ridimensiona la visyalizzazione in modo da mostrare l'intreccio completo @@ -2140,57 +2150,57 @@ p, li { white-space: pre-wrap; } Antepri&ma di Stampa... - + &Connect &Connetti - + F - + &Disconnect &Disconnetti - + &Horizontal Flip Capovolgi &Orizzontalmente - + &Vertical Flip Capovolgi &Verticalmente - + &Rotate &Ruota - + &Scale Ridimen&siona - + &Merge &Unisci - + Ctrl+M - + &Erase &Rimuovi - + Del Canc @@ -2199,7 +2209,7 @@ p, li { white-space: pre-wrap; } &Modifica Grafo - + Alt+Shift+E Alt+Maiusc+E @@ -2208,72 +2218,72 @@ p, li { white-space: pre-wrap; } &Lista di Archi - + Alt+Shift+L Alt+Maiusc+L - + &Toggle Edges Abili&ta/Disabilita Archi - + &Refresh Path &Aggiorna Immagine - + &Manual &Manuale - + &About Knotter... Inform&azioni su Knotter... - + Select Connected Seleziona connessi - + Ctrl+L - + &Enable Grid A&bilita Griglia - + E&xport... Es&porta... - + Ctrl+E - + Snap to &Grid Allinea alla &Griglia - + &Undo &Annulla - + &Redo &Ripeti - + &Configure Plugins... &Configura Estensioni... @@ -2291,17 +2301,17 @@ p, li { white-space: pre-wrap; } Sile Selezione - + Action History Storico Azioni - + Selected Nodes Nodi selezionati - + Selected Edges Archi selezionati @@ -2310,22 +2320,22 @@ p, li { white-space: pre-wrap; } Sile predefinito - + Warning: Attenzione: - + Discarding old configuration La vecchia configurazione verrà ignorara - + Load old configuration Carica vecchia configurazione - + Knotter has detected configuration for version %1, this is version %2. Do you want to load it anyways? @@ -2334,118 +2344,118 @@ Questa è la versione %2. Vuoi caricare le vecchie impostazioni? - - + + New Knot Nuovo Nodo - + %1 - %2%3 Main window title * %1 is the program name * %2 is the file name * %3 is a star * or an empty string depending on whether the file was modified - - + + File Error Errore di file - + Error while reading "%1". Errore durante la lettura di "%1". - + Close File Chiudi File - + The file "%1" has been modified. Do you want to save changes? Il file "%1" è stato modificato. Vuoi salvare le modifiche? - + Undo %1 Annlla %1 - + Redo %1 Ripristina %1 - + Open Knot Apri nodo - + Knot files (*.knot);;XML files (*.xml);;All files (*) File intreccio (*.knot);;File XML (*.knot);;Tutti i file(*) - + Save Knot Salva nodo - + Failed to save file "%1". Errore durante il salvataggio di "%1". - + (%1,%2) Displaying mouse position, %1 = x, %2 = y - + No recent files Nessun file recente - + Paste Incolla - + Cut Taglia - + Drop Nodo Rilasciato - + Snap to Grid Blocca sulla griglia - + Delete Cancella - + Connect Nodes Connetti vertici - + Disconnect Nodes Disconnetti vertici - + Merge Nodes Unisci vertici @@ -2590,7 +2600,7 @@ Vuoi salvare le modifiche? Poligonale - + %1:%2:Error: %3 %1:%2:Errore:%3 @@ -2629,6 +2639,16 @@ Vuoi salvare le modifiche? Error while opening script file %1 Errore durante l'apertura del file di script %1 + + + Expected file name for run_script() + + + + + Cannot open file "%1" + + Remove_Edge @@ -2649,50 +2669,50 @@ Vuoi salvare le modifiche? Resource_Manager - + Knotter - - - + + + Warning: Attenzione: - + Unrecognised translation file name pattern: %1 Nome file di traduzione non riconosciuto: %1 - + Error on loading translation file %1 for language %2 (%3) %1 is the file name, * %2 is the human-readable language code * %3 is the ISO language code Errore durante il caricamento del file di traduzione %1 per la lingua %2 (%3) - + There is no translation for language %1 (%2) Nessun file di traduzione per la lingua %1 (%2) - + Cannot open file Impossibile aprire il file - + Unknown error Errore sconosciuto - + %1: Error: %2 %1: Errore: %2 - + Script aborted Script terminato di forza @@ -2714,10 +2734,18 @@ Vuoi salvare le modifiche? Carica file + + Script_QTableWidget + + + Argument is not a QTableWidget object + + + Script_Window_Dialog - + Cancel Annulla diff --git a/data/translations/knotter_ru.ts b/data/translations/knotter_ru.ts index 726bc32..0620ad7 100644 --- a/data/translations/knotter_ru.ts +++ b/data/translations/knotter_ru.ts @@ -2201,10 +2201,42 @@ p, li { white-space: pre-wrap; } Удалить - + Add + + + Spiral + + + + + End Angle + + + + + + + ° + ° + + + + Start Angle + + + + + Turning Size + + + + + Angle Step + + Fill Area @@ -2285,38 +2317,6 @@ p, li { white-space: pre-wrap; } Mirror Y - - - Spiral - - - - - End Angle - - - - - - - ° - ° - - - - Start Angle - - - - - Turning Size - - - - - Angle Step - - Dialog_Confirm_Close @@ -2420,7 +2420,7 @@ p, li { white-space: pre-wrap; } - + Disabled @@ -2450,32 +2450,42 @@ p, li { white-space: pre-wrap; } Значение - + + View &Settings... + + + + + C&lear Settings + + + + No plugin installed Нет установленных модулей - + &Reload Plugins &Перезагрузить модули - + &Create... - + &OK &OK - + All - + Enabled @@ -3736,212 +3746,212 @@ p, li { white-space: pre-wrap; } В&ыйти - + &Copy &Копировать - + &Paste В&ставить - + Cu&t Вы&резать - + Select &All Выделить &все - + &Preferences... &Настройки... - + &Reset View С&бросить вид - + Zoom &In &Увеличить масштаб - + Zoom &Out У&меньшить масштаб - + &Reset Zoom &Сбросить масштаб - + Ctrl+0 Ctrl+0 - + Display &Graph Отображать &граф - + &Connect &Соединить - + F F - + &Disconnect Р&азъединить - + &Horizontal Flip Отразить по &горизонтали - + &Vertical Flip Отразить по &вертикали - + &Rotate П&овернуть - + &Scale &Изменить размер - + &Merge О&бъединить - + Ctrl+M Ctrl+M - + &Erase &Удалить - + Del Del - + &Select - + Alt+Shift+E Alt+Shift+E - + Edge &Chain - + Alt+Shift+L Alt+Shift+L - + &Refresh Path - + &Manual &Руководство - + &About Knotter... &О Knotter... - + E&xport... &Экспортировать... - + Ctrl+E Ctrl+E - + Snap to &Grid При&вязать к сетке - + &Undo &Отменить - + &Redo В&ернуть - + &Configure Plugins... &Настроить модули... - + Report &Bugs... С&ообщить об ошибках... - + Select Connected Выделить соединённые - + Ctrl+L Ctrl+L - + &Enable Grid &Показать сетку - + &Toggle Edges - + &Fit View - + Scroll and zoom the view to display the entire knot @@ -3951,37 +3961,37 @@ p, li { white-space: pre-wrap; } Масштаб - + Action History История действий - + Selected Nodes - + Selected Edges - + Warning: Предупреждение: - + Discarding old configuration - + Load old configuration Загрузить старые настройки - + Knotter has detected configuration for version %1, this is version %2. Do you want to load it anyways? @@ -3990,118 +4000,118 @@ Do you want to load it anyways? Всё равно загрузить их? - - + + New Knot Новый узел - + %1 - %2%3 Main window title * %1 is the program name * %2 is the file name * %3 is a star * or an empty string depending on whether the file was modified %1 - %2%3 - - + + File Error Ошибка файла - + Error while reading "%1". Ошибка при чтении «%1». - + Close File Закрыть файл - + The file "%1" has been modified. Do you want to save changes? Файл «%1» был изменён. Хотите сохранить изменения? - + Undo %1 Отменить %1 - + Redo %1 Вернуть %1 - + Open Knot Открыть узел - + Knot files (*.knot);;XML files (*.xml);;All files (*) Файлы узлов (*.knot);;XML-файлы (*.xml);;Все файлы (*) - + Save Knot Сохранить узел - + Failed to save file "%1". Не удалось сохранить файл «%1». - + (%1,%2) Displaying mouse position, %1 = x, %2 = y (%1,%2) - + No recent files Нет недавних файлов - + Paste Вставить - + Cut Вырезать - + Drop - + Snap to Grid Привязать к сетке - + Delete Удалить - + Connect Nodes Соединить вершины - + Disconnect Nodes Разъединить вершины - + Merge Nodes Объединить вершины @@ -4230,7 +4240,7 @@ Do you want to save changes? Многоугольный - + %1:%2:Error: %3 %1:%2:Ошибка: %3 @@ -4274,6 +4284,16 @@ Do you want to save changes? Unknown action %1 Неизвестное действие %1 + + + Expected file name for run_script() + + + + + Cannot open file "%1" + + Remove_Edge @@ -4294,50 +4314,50 @@ Do you want to save changes? Resource_Manager - + Knotter Knotter - - - + + + Warning: Предупреждение: - + Unrecognised translation file name pattern: %1 Нераспознанный шаблон имени файла с переводом: %1 - + Error on loading translation file %1 for language %2 (%3) %1 is the file name, * %2 is the human-readable language code * %3 is the ISO language code Ошибка при загрузке файла перевода %1 для языка %2 (%3) - + There is no translation for language %1 (%2) Нет перевода для языка %1 (%2) - + Cannot open file - + Unknown error Неизвестная ошибка - + %1: Error: %2 %1: Ошибка: %2 - + Script aborted @@ -4355,10 +4375,18 @@ Do you want to save changes? Загрузить файл + + Script_QTableWidget + + + Argument is not a QTableWidget object + + + Script_Window_Dialog - + Cancel Отменить diff --git a/knotter.pro b/knotter.pro index 001dcd0..0532af8 100644 --- a/knotter.pro +++ b/knotter.pro @@ -13,6 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Workaround a bug in OSX Qt5 +macx { + cache() +} + # Base configutation QT += core gui xml script svg @@ -26,8 +31,11 @@ OBJECTS_DIR = obj include(knotter_info.pri) include(src/src.pri) include(translations.pri) -include(data/plugins/plugins.pri) +#include for lupdate but discard on compilation +!debug:!release { + include(data/plugins/plugins.pri) +} #non-source files OTHER_FILES = \ diff --git a/knotter_info.pri b/knotter_info.pri index 1ea74c3..3c60e3e 100644 --- a/knotter_info.pri +++ b/knotter_info.pri @@ -16,7 +16,7 @@ # executable/package name TARGET=knotter # program version -VERSION=0.9.6_devel +VERSION=0.9.6_devel_a # capitalized name TITLE=Knotter # Short description diff --git a/man/knotter.1.gz b/man/knotter.1.gz index 136288d2b1267ea7fa48a3272c2617c0dc6f12db..565c91878543652156ff81a124d1c69993859677 100644 GIT binary patch delta 511 zcmVq!m&f_c0uBiKNWvrT?nd$H!zvNq>GZ* z@|}G9P^z;s4>*A@7g-3IEns!CoQqC@1X4@?SOk4maH~wvMLZ7kQU}*v$-b}Fn=H+Q zoDK;gPmcLv`zJq4^W;3NjJQ4|?y#*q2${k`8%2xl6z(8#EN#J^LURgmFY*^s%6r~U zY5QkLTobgjp03YTdp`gAF?Ex*Q=ot?5(_EIpLP3Lk!g?8Rc_>?a zwD73IvBy9`clQd^ug0}Om4F_yZ=ZoME&7PBu~J@Myudp8$biF)8c6wSWWPf0Hf%3; z<`qywlH{mNBQ`Dh0bY{Lk`n14hr{Rb@L9EaC+$3FmO1Q=Z?>(v10 z;;T#1^Ex(u064mw@_>3!p5#e4oNh={{mJcuWGS5 z_Qqn+Ki6O97^|KbyRdpw&xOTFEwwKg3z55jialvDbM|EbACP9l9MS*}{AL?$W7(`0 zuCDnB7;RPeif_K|7VE88($}F8rs%PvM#1|!3Uc2GAFCR*kp%c4{sJZf{^@W80078z B^y2^k delta 509 zcmVG2P_NGZ* z@|}G9qf}>QCh+AV3L&!vtZtTb(J7EXYUv+~pw9|!l?l3t$6;RT;JPc>_tkonrJ0b^ zAsyt&F+Xe{^TRYx&cn)x>qFuW+scEGDIBy>wAfDJ4id-G7ThT`rvUdNe<7v3=k1iX ze}%*~K|AYd>*9Z4HqUOi>1LO%SIi#@>g&)R(1MDd;XpslWf?3KG{`5cm+_W|vc(4r z4>}xs3>0*CuR#57TpLsg=pp;|83@y&kN6rZ<>kc-tfP+%ILxSll&?niE97p&_F`vV z0W~B^j>#*J4S+7b zx)eRHW8(*aqsu7|s0Zaqo^-?McEmh32Mjd?jKh-J#JYq}(HT#Gv=gPHjn>r=j@;2e z>B;qI7DuyagGQs#i@C+UVV9ktZ55};jDs`AJ+N|_j~`j~3TE9EkIMfqU^Vip7Mo*l zEC&5^eU4qR>WQ%nt2gyrSe(>S`+~6$x%;QslNK{)Uk302X*SFu4e-Ekw!t=*&1&K5 znxBBtR&}rV=Id^;-ijrC9U5VZ9xG}Tysx7m_nq*us! Date: Tue, 12 Nov 2013 10:58:30 +0100 Subject: [PATCH 2/2] Ensure that the Qt4.7 script preserves plugins --- package/qt-4.7/port-back.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt-4.7/port-back.sh b/package/qt-4.7/port-back.sh index 1819d0f..89e7e27 100755 --- a/package/qt-4.7/port-back.sh +++ b/package/qt-4.7/port-back.sh @@ -19,7 +19,7 @@ mkdir src/ui mv src/generated/ui_*.h src/ui rmdir src/generated obj -find -name '*.ui' -delete +find -name '*.ui' -path './src/*' -delete cd src/ui