diff --git a/build-aux/windows/QET64.nsi b/build-aux/windows/QET64.nsi index f5c791f66..c253af51c 100644 --- a/build-aux/windows/QET64.nsi +++ b/build-aux/windows/QET64.nsi @@ -277,6 +277,12 @@ Section "$(Examples)" SEC04 File /r "./files/examples" SectionEnd +SetOverwrite on +Section "$(Fonts)" SEC05 + SetOutPath "$INSTDIR\fonts" + File /r "./files/fonts" +SectionEnd + ;-------------------------------- ; Component descriptions !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN @@ -284,6 +290,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2) !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3) !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4) + !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $(var5) !insertmacro MUI_FUNCTION_DESCRIPTION_END ;-------------------------------- diff --git a/build-aux/windows/lang_extra.nsh b/build-aux/windows/lang_extra.nsh index 05d7f7ac4..e8007bcd8 100644 --- a/build-aux/windows/lang_extra.nsh +++ b/build-aux/windows/lang_extra.nsh @@ -17,6 +17,7 @@ LangString var2 ${LANG_ENGLISH} "languagues files" LangString var3 ${LANG_ENGLISH} "Examples of cartridges" LangString var4 ${LANG_ENGLISH} "Examples of diagrams" + LangString var5 ${LANG_ENGLISH} "Fonts" LangString uninstFailed ${LANG_ENGLISH} "Uninstallation of the previous version failed.$\nPlease uninstall ${SOFT_NAME} manually before continuing." @@ -39,6 +40,7 @@ LangString var2 ${LANG_KOREAN} "언어 파일" LangString var3 ${LANG_KOREAN} "표제란 예제" LangString var4 ${LANG_KOREAN} "도면 예제" + LangString var5 ${LANG_KOREAN} "글꼴" LangString uninstFailed ${LANG_KOREAN} "이전 버전을 제거하지 못했습니다.$\n계속하기 전에 ${SOFT_NAME}을(를) 수동으로 제거해 주세요." @@ -61,6 +63,7 @@ LangString var2 ${LANG_POLISH} "Pliki językowe" LangString var3 ${LANG_POLISH} "Przykłady tabliczek rysunkowych" LangString var4 ${LANG_POLISH} "Przykłady schematów" + LangString var5 ${LANG_POLISH} "Czcionki" LangString uninstFailed ${LANG_POLISH} "Odinstalowanie poprzedniej wersji nie powiodło się.$\nPrzed kontynuowaniem odinstaluj ręcznie program ${SOFT_NAME}." @@ -83,6 +86,7 @@ LangString var2 ${LANG_GREEK} "Αρχεία γλωσσών" LangString var3 ${LANG_GREEK} "Παραδείγματα πινακίδων" LangString var4 ${LANG_GREEK} "Παραδείγματα διαγραμμάτων" + LangString var5 ${LANG_GREEK} "Γραμματοσειρές" LangString uninstFailed ${LANG_GREEK} "Η απεγκατάσταση της προηγούμενης έκδοσης απέτυχε.$\nΠαρακαλώ απεγκαταστήστε χειροκίνητα το ${SOFT_NAME} πριν συνεχίσετε." @@ -105,6 +109,7 @@ LangString var2 ${LANG_CZECH} "Jazykové soubory" LangString var3 ${LANG_CZECH} "Příklady popisových polí" LangString var4 ${LANG_CZECH} "Příklady schémat" + LangString var5 ${LANG_CZECH} "Písma" LangString uninstFailed ${LANG_CZECH} "Odinstalování předchozí verze se nezdařilo.$\nPřed pokračováním prosím odinstalujte ${SOFT_NAME} ručně." @@ -127,6 +132,7 @@ LangString var2 ${LANG_SPANISH} "Archivos de idioma" LangString var3 ${LANG_SPANISH} "Ejemplos de cartelas" LangString var4 ${LANG_SPANISH} "Ejemplos de esquemas" + LangString var5 ${LANG_SPANISH} "Fuentes" LangString uninstFailed ${LANG_SPANISH} "La desinstalación de la versión anterior ha fallado.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar." @@ -149,6 +155,7 @@ LangString var2 ${LANG_GERMAN} "Sprachdateien" LangString var3 ${LANG_GERMAN} "Schriftfeld-Beispiele" LangString var4 ${LANG_GERMAN} "Schaltplan-Beispiele" + LangString var5 ${LANG_GERMAN} "Schriften" LangString uninstFailed ${LANG_GERMAN} "Die Deinstallation der vorherigen Version ist fehlgeschlagen.$\nBitte deinstallieren Sie ${SOFT_NAME} manuell, bevor Sie fortfahren." @@ -171,6 +178,7 @@ LangString var2 ${LANG_RUSSIAN} "языковые файлы" LangString var3 ${LANG_RUSSIAN} "Примеры штампов" LangString var4 ${LANG_RUSSIAN} "Примеры схем" + LangString var5 ${LANG_RUSSIAN} "Шрифты" LangString uninstFailed ${LANG_RUSSIAN} "Удаление предыдущей версии завершилось с ошибкой.$\nПожалуйста, удалите ${SOFT_NAME} вручную перед продолжением." @@ -193,6 +201,7 @@ LangString var2 ${LANG_ARABIC} "ملفات اللغة" LangString var3 ${LANG_ARABIC} "أمثلة على كتل العنوان" LangString var4 ${LANG_ARABIC} "أمثلة على المخططات" + LangString var5 ${LANG_ARABIC} "الخطوط" LangString uninstFailed ${LANG_ARABIC} "فشل إلغاء تثبيت الإصدار السابق. يرجى إلغاء تثبيت ${SOFT_NAME} يدويًا قبل المتابعة." @@ -215,6 +224,7 @@ LangString var2 ${LANG_CATALAN} "Fitxers d'idioma" LangString var3 ${LANG_CATALAN} "Exemples de cartutxos" LangString var4 ${LANG_CATALAN} "Exemples d'esquemes" + LangString var5 ${LANG_CATALAN} "Tipus de lletra" LangString uninstFailed ${LANG_CATALAN} "La desinstal·lació de la versió anterior ha fallat.$\nSi us plau, desinstal·leu ${SOFT_NAME} manualment abans de continuar." @@ -237,6 +247,7 @@ LangString var2 ${LANG_ITALIAN} "File della lingua" LangString var3 ${LANG_ITALIAN} "Cartigli di esempio" LangString var4 ${LANG_ITALIAN} "Schemi di esempio" + LangString var5 ${LANG_ITALIAN} "Caratteri" LangString uninstFailed ${LANG_ITALIAN} "La disinstallazione della versione precedente non è riuscita.$\nSi prega di disinstallare ${SOFT_NAME} manualmente prima di continuare." @@ -259,6 +270,7 @@ LangString var2 ${LANG_PORTUGUESE} "Arquivos de idioma" LangString var3 ${LANG_PORTUGUESE} "Exemplos de legendas" LangString var4 ${LANG_PORTUGUESE} "Exemplos de esquemas" + LangString var5 ${LANG_PORTUGUESE} "Fontes" LangString uninstFailed ${LANG_PORTUGUESE} "A desinstalação da versão anterior falhou.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar." @@ -281,6 +293,7 @@ LangString var2 ${LANG_ROMANIAN} "Fișiere de limbă" LangString var3 ${LANG_ROMANIAN} "Exemple de cartușe" LangString var4 ${LANG_ROMANIAN} "Exemple de scheme" + LangString var5 ${LANG_ROMANIAN} "Fonturi" LangString uninstFailed ${LANG_ROMANIAN} "Dezinstalarea versiunii anterioare a eșuat.$\nVă rugăm să dezinstalați ${SOFT_NAME} manual înainte de a continua." @@ -303,6 +316,7 @@ LangString var2 ${LANG_CROATIAN} "Jezične datoteke" LangString var3 ${LANG_CROATIAN} "Primjeri zaglavlja" LangString var4 ${LANG_CROATIAN} "Primjeri shema" + LangString var5 ${LANG_CROATIAN} "Fontovi" LangString uninstFailed ${LANG_CROATIAN} "Deinstalacija prethodne verzije nije uspjela.$\nMolimo deinstalirajte ${SOFT_NAME} ručno prije nastavka." @@ -325,6 +339,7 @@ LangString var2 ${LANG_DUTCH} "Taalbestanden" LangString var3 ${LANG_DUTCH} "Voorbeelden van titelblokken" LangString var4 ${LANG_DUTCH} "Voorbeelden van schema's" + LangString var5 ${LANG_DUTCH} "Lettertypen" LangString uninstFailed ${LANG_DUTCH} "Het verwijderen van de vorige versie is mislukt.$\nVerwijder ${SOFT_NAME} handmatig voordat u verdergaat." @@ -347,6 +362,7 @@ LangString var2 ${LANG_DANISH} "Sprog filer" LangString var3 ${LANG_DANISH} "Titel blokke eksempler" LangString var4 ${LANG_DANISH} "Diagram eksempler" + LangString var5 ${LANG_DANISH} "Skrifttyper" LangString uninstFailed ${LANG_DANISH} "Afinstallation af den tidligere version mislykkedes.$\nAfinstaller venligst ${SOFT_NAME} manuelt, inden du fortsætter." diff --git a/build-aux/windows/lang_extra_fr.nsh b/build-aux/windows/lang_extra_fr.nsh index 674d8a0c0..0338b5653 100644 --- a/build-aux/windows/lang_extra_fr.nsh +++ b/build-aux/windows/lang_extra_fr.nsh @@ -17,4 +17,5 @@ LangString var2 ${LANG_FRENCH} "Fichiers de langues" LangString var3 ${LANG_FRENCH} "Exemples de cartouches" LangString var4 ${LANG_FRENCH} "Exemples de schémas" + LangString var5 ${LANG_FRENCH} "Polices" LangString uninstFailed ${LANG_FRENCH} "La désinstallation de la version précédente a échoué.$\nVeuillez désinstaller ${SOFT_NAME} manuellement avant de continuer." diff --git a/build-aux/windows/lang_extra_missing.nsh b/build-aux/windows/lang_extra_missing.nsh index affab77a3..523010984 100644 --- a/build-aux/windows/lang_extra_missing.nsh +++ b/build-aux/windows/lang_extra_missing.nsh @@ -23,6 +23,7 @@ LangString var2 ${LANG_HUNGARIAN} "Nyelvfájlok" LangString var3 ${LANG_HUNGARIAN} "Rajzfejléc-példák" LangString var4 ${LANG_HUNGARIAN} "Kapcsolási rajz példák" + LangString var5 ${LANG_HUNGARIAN} "Betűtípusok" LangString uninstFailed ${LANG_HUNGARIAN} "Az előző verzió eltávolítása nem sikerült.$\nKérjük, távolítsa el manuálisan a ${SOFT_NAME} programot, mielőtt folytatná." @@ -48,6 +49,7 @@ LangString var2 ${LANG_JAPANESE} "言語ファイル" LangString var3 ${LANG_JAPANESE} "表題欄の例" LangString var4 ${LANG_JAPANESE} "回路図の例" + LangString var5 ${LANG_JAPANESE} "フォント" LangString uninstFailed ${LANG_JAPANESE} "前のバージョンのアンインストールに失敗しました。$\n続行する前に、${SOFT_NAME} を手動でアンインストールしてください。" @@ -73,6 +75,7 @@ LangString var2 ${LANG_MONGOLIAN} "Хэлний файлууд" LangString var3 ${LANG_MONGOLIAN} "Гарчгийн блокын жишээнүүд" LangString var4 ${LANG_MONGOLIAN} "Схемийн жишээнүүд" + LangString var5 ${LANG_MONGOLIAN} "Фонт" LangString uninstFailed ${LANG_MONGOLIAN} "Өмнөх хувилбарыг устгаж чадсангүй.$\nҮргэлжлүүлэхийн өмнө ${SOFT_NAME}-г гараар устгана уу." @@ -98,6 +101,7 @@ LangString var2 ${LANG_NORWEGIAN} "Språkfiler" LangString var3 ${LANG_NORWEGIAN} "Eksempler på titelblokker" LangString var4 ${LANG_NORWEGIAN} "Eksempler på skjemaer" + LangString var5 ${LANG_NORWEGIAN} "Skrifttyper" LangString uninstFailed ${LANG_NORWEGIAN} "Avinstallasjon av forrige versjon mislyktes.$\nVennligst avinstaller ${SOFT_NAME} manuelt før du fortsetter." @@ -133,6 +137,7 @@ LangString var2 ${LANG_PORTUGUESEBR} "Arquivos de idioma" LangString var3 ${LANG_PORTUGUESEBR} "Exemplos de legendas" LangString var4 ${LANG_PORTUGUESEBR} "Exemplos de esquemas" + LangString var5 ${LANG_PORTUGUESEBR} "Fontes" LangString uninstFailed ${LANG_PORTUGUESEBR} "A desinstalação da versão anterior falhou.$\nPor favor, desinstale ${SOFT_NAME} manualmente antes de continuar." @@ -158,6 +163,7 @@ LangString var2 ${LANG_SERBIAN} "Језичке датотеке" LangString var3 ${LANG_SERBIAN} "Примери заглавља" LangString var4 ${LANG_SERBIAN} "Примери шема" + LangString var5 ${LANG_SERBIAN} "Фонтови" LangString uninstFailed ${LANG_SERBIAN} "Деинсталација претходне верзије није успела.$\nМолимо деинсталирајте ${SOFT_NAME} ручно пре наставка." @@ -183,6 +189,7 @@ LangString var2 ${LANG_SLOVAK} "Jazykové súbory" LangString var3 ${LANG_SLOVAK} "Príklady popisových polí" LangString var4 ${LANG_SLOVAK} "Príklady schém" + LangString var5 ${LANG_SLOVAK} "Písma" LangString uninstFailed ${LANG_SLOVAK} "Odinštalovanie predchádzajúcej verzie zlyhalo.$\nPred pokračovaním odinštalujte ${SOFT_NAME} ručne." @@ -208,6 +215,7 @@ LangString var2 ${LANG_SLOVENIAN} "Jezikovne datoteke" LangString var3 ${LANG_SLOVENIAN} "Primeri glav risb" LangString var4 ${LANG_SLOVENIAN} "Primeri shem" + LangString var5 ${LANG_SLOVENIAN} "Pisave" LangString uninstFailed ${LANG_SLOVENIAN} "Odstranitev prejšnje različice ni uspela.$\nPred nadaljevanjem ročno odstranite ${SOFT_NAME}." @@ -233,6 +241,7 @@ LangString var2 ${LANG_SWEDISH} "Språkfiler" LangString var3 ${LANG_SWEDISH} "Exempel på ritningshuvuden" LangString var4 ${LANG_SWEDISH} "Exempel på scheman" + LangString var5 ${LANG_SWEDISH} "Teckensnitt" LangString uninstFailed ${LANG_SWEDISH} "Avinstallationen av den föregående versionen misslyckades.$\nAvinstallera ${SOFT_NAME} manuellt innan du fortsätter." @@ -258,6 +267,7 @@ LangString var2 ${LANG_TURKISH} "Dil dosyaları" LangString var3 ${LANG_TURKISH} "Başlık bloğu örnekleri" LangString var4 ${LANG_TURKISH} "Şema örnekleri" + LangString var5 ${LANG_TURKISH} "Yazı Tipleri" LangString uninstFailed ${LANG_TURKISH} "Önceki sürümün kaldırılması başarısız oldu.$\nDevam etmeden önce lütfen ${SOFT_NAME}'i manuel olarak kaldırın." @@ -283,6 +293,7 @@ LangString var2 ${LANG_UKRAINIAN} "Мовні файли" LangString var3 ${LANG_UKRAINIAN} "Приклади штампів" LangString var4 ${LANG_UKRAINIAN} "Приклади схем" + LangString var5 ${LANG_UKRAINIAN} "Шрифти" LangString uninstFailed ${LANG_UKRAINIAN} "Видалення попередньої версії завершилося помилкою.$\nБудь ласка, видаліть ${SOFT_NAME} вручну перед продовженням." @@ -308,4 +319,5 @@ LangString var2 ${LANG_SIMPCHINESE} "语言文件" LangString var3 ${LANG_SIMPCHINESE} "标题栏示例" LangString var4 ${LANG_SIMPCHINESE} "图纸示例" + LangString var5 ${LANG_SIMPCHINESE} "字体" LangString uninstFailed ${LANG_SIMPCHINESE} "卸载旧版本失败。$\n请在继续之前手动卸载 ${SOFT_NAME}。"