From 55d498f7388f9c8eaaa0fb3faa4eeb61b752cc6d Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 29 Jan 2020 20:01:07 +0100 Subject: [PATCH] MUI - Add "Reload Strings" - Translation of strings into FR, ES and NL --- Build/Changes.txt | 6 +++++- language/np3_af_za/strings_af_za.rc | 3 ++- language/np3_be_by/strings_be_by.rc | 5 +++-- language/np3_de_de/strings_de_de.rc | 4 ++-- language/np3_en_gb/strings_en_gb.rc | 6 +++--- language/np3_en_us/strings_en_us.rc | 6 +++--- language/np3_es_es/strings_es_es.rc | 6 ++++-- language/np3_fr_fr/strings_fr_fr.rc | 6 ++++-- language/np3_hu_hu/strings_hu_hu.rc | 7 ++++--- language/np3_it_it/strings_it_it.rc | 7 ++++--- language/np3_ja_jp/strings_ja_jp.rc | 2 ++ language/np3_ko_kr/strings_ko_kr.rc | 5 +++-- language/np3_nl_nl/strings_nl_nl.rc | 6 ++++-- language/np3_pl_pl/strings_pl_pl.rc | 7 ++++--- language/np3_pt_br/strings_pt_br.rc | 6 ++++-- language/np3_ru_ru/strings_ru_ru.rc | 5 +++-- language/np3_sk_sk/strings_sk_sk.rc | 6 ++++-- language/np3_sv_se/strings_sv_se.rc | 7 ++++--- language/np3_tr_tr/strings_tr_tr.rc | 6 ++++-- language/np3_zh_cn/strings_zh_cn.rc | 5 +++-- test/test_files/encoding/UTF-8/í (issue #1924).json | 1 + test/test_files/encoding/UTF-8/ú (issue #1924).json | 1 + 22 files changed, 71 insertions(+), 42 deletions(-) create mode 100644 test/test_files/encoding/UTF-8/í (issue #1924).json create mode 100644 test/test_files/encoding/UTF-8/ú (issue #1924).json diff --git a/Build/Changes.txt b/Build/Changes.txt index 675c63bb0..66f3b3445 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current BETA Version 5.20.127.(build_#) (2020-01-27) +Current BETA Version 5.20.129.(build_#) (2020-01-29) ===================================================== ----------------------------------------------------- @@ -50,6 +50,8 @@ NEW: ----------------------------------------------------- CHANGES: ----------------------------------------------------- +- Finetuning of Single Byte Char Set (SBCS) detection. +- Add current Encoding and Lexer to "Copy Version Text". - Lexer keyword initializer list simplified. - Find/Replace dialog: in case of "transform backslashes" do Esc control seqs. - Remove "extra" drag n' drop handler. @@ -103,6 +105,7 @@ ENHANCEMENT: ----------------------------------------------------- FIXES: ----------------------------------------------------- +- Transform backslashes while pasting into search/replace box. - Some issues for lexers: YAML and JSON. - Clipboard multi-line paste hook for Find/Replace pattern CB. - Allow multi-line Search Find/Replace pattern. @@ -301,6 +304,7 @@ ENHANCEMENT: ----------------------------------------------------- FIXES: ----------------------------------------------------- +- Changing .ini-file manually. - Load external Toolbars (clear config on error, path relative to be portable). - Focused View: refolding by lexer. - Focused View started from Find/Replace dialog. diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 3363b747e..7ae7a898a 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -144,7 +144,6 @@ BEGIN IDS_MUI_ERR_DROP "Slegs een lêer kan op dieselfde tyd laat val word!" IDS_MUI_ERR_ACCESSDENIED "Die lêer %s kan nie gestoor word nie en kan beskermd wees.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "Die lêer %s kan nie gestoor word nie en kan beskermd wees.\n\nWil u Notepad as Administrateur begin?" IDS_MUI_ERR_ADMINEXE "Kon geen administrasie uitvoerbaar vind nie. \nGaan na https://www.rizonesoft.com vir meer?" IDS_MUI_WARN_LOAD_BIG_FILE "Is jy seker jy wil hierdie groot lêer oopmaak?" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Kon nie stylinstellings uitvoer na ""%s""." IDS_MUI_REGEX_INVALID "Kon nie regular expression evalueer nie. Expression is ongeldig!" IDS_MUI_DROP_NO_FILE "Geen geldige lêernaam opgehaal.\nAs jy van 32-bit toepassing af sak, sleep na Notepad3 se nutsbalk." diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 286ef3d36..1b9076432 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -144,8 +144,7 @@ BEGIN IDS_MUI_ERR_DROP "За адзін раз можна перацягнуць толькі адзін файл!" IDS_MUI_ERR_ACCESSDENIED "Файл «%s» нельга захаваць з прычыны абароны ад змянення.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "Файл «%s» нельга захаваць з прычыны абароны ад змянення.\n\nХочаце запусціць Notepad3 ад імя Адміністратара?" - IDS_MUI_ERR_ADMINEXE "Не знойдены інструмент адміністратара\nНаведаць сайт https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Не знойдены інструмент адміністратара\nНаведаць сайт https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Вы ўпэўнены, што хочаце адкрыць гэты вялікі файл?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Памылка экспарту наладаў стыляў «%s»." IDS_MUI_REGEX_INVALID "Памылка апрацоўкі рэгулярнага выразу. Выраз несапраўдны!" IDS_MUI_DROP_NO_FILE "Не выйшла атрымаць імя файла. \nКалі перацягваеце з 32-бітнай праграмы,\nперацягніце на паліцу прыладаў Notepad3." diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 6d412e9ff..ace28c3ce 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -149,7 +149,7 @@ BEGIN "Bist Du sicher, dass Du diese sehr große Datei öffnen möchtest?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Unbekannte Dateierweiterung (%s) !\nSollen die Daten trotzdem geladen werden?" + "Unbekannte Dateierweiterung (%s)!\nSollen die Daten trotzdem geladen werden?" IDS_MUI_INDENT_CONSISTENT "Die Datei hat einheitliche Einrückungen!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,7 +182,7 @@ END STRINGTABLE BEGIN - IDS_MUI_RELOADSETTINGS "Die aktuellen Notepad3 Einstellungen durch einen Neustart aktivieren ?\n\n%s" + IDS_MUI_RELOADSETTINGS "Die aktuellen Notepad3 Einstellungen durch einen Neustart aktivieren?\n\n%s" IDS_MUI_RELOADCFGSEX "Bei Fortsetzung ohne Neustart werden die gespeicherten Einstellungen nicht genutzt und beim Verlassen von Notepad3 von den internen Einstellungen überschrieben!" IDS_MUI_EXPORT_FAIL "Fehler beim Export der Stil Einstellungen nach ""%s""." IDS_MUI_REGEX_INVALID "Fehler bei der Evaluierung des regulären Ausdrucks (RegEx), der Ausruck ist ungültig!" diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index fe391cd09..2e906eb6d 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!" IDS_MUI_ERR_ACCESSDENIED "The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?" - IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Unknown file name extension (%s) !\nLoading data anyway ?" + "Unknown file name extension (%s)!\nLoading data anyway?" IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,7 +182,7 @@ END STRINGTABLE BEGIN - IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch ?\n\n%s" + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""." IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!" diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 9c61bbd86..7232dc16c 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!" IDS_MUI_ERR_ACCESSDENIED "The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?" - IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Unknown file name extension (%s) !\nLoading data anyway ?" + "Unknown file name extension (%s)!\nLoading data anyway?" IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,7 +182,7 @@ END STRINGTABLE BEGIN - IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch ?\n\n%s" + IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s" IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""." IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!" diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index b78fea225..18674eda0 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -144,9 +144,9 @@ BEGIN IDS_MUI_ERR_DROP "¡Sólo se puede eliminar un archivo al mismo tiempo!" IDS_MUI_ERR_ACCESSDENIED "El archivo ""%s"" no se puede guardar y puede estar protegido.\n\n¿Quiere lanzar %s como aplicación elevada?" - IDS_MUI_ERR_ADMINEXE "No se ha encontrado administración ejecutable .\n¿Consultar website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "No se ha encontrado administración ejecutable.\n¿Consultar website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE - "¿¿Seguro que quiere abrir este archivo tan grande??" + "¿Seguro que quiere abrir este archivo tan grande?" IDS_MUI_ERR_FILE_TOO_LARGE "No puedo manejar ese archivo enorme (tamaño: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT "¡Extensión de nombre de archivo desconocido (%s)!\n¿Cargar de todos modos?" @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "¿Activar la configuración actual reiniciando?n\n%s" + IDS_MUI_RELOADCFGSEX "¡Al continuar sin reiniciar, las configuraciones guardadas no se aplican y serán anuladas por las configuraciones internas al salir del programa!" IDS_MUI_EXPORT_FAIL "Error al exportar la configuración de estilo a ""%s""." IDS_MUI_REGEX_INVALID "Error al evaluar la expresión regular. ¡La expresión es inválida!" IDS_MUI_DROP_NO_FILE "No se recuperó un nombre de archivo válido.\nSi se usa una aplicación de 32 bits,\nintente arrastrar el archivo a la barra de herramientas Notepad3." diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index 5d0c9dfd8..4164a4bb8 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Un seul fichier peut être déposé en même temps!" IDS_MUI_ERR_ACCESSDENIED "Le fichier ""% s "" ne peut pas être sauvegardé et est peut-être protégé.\n\nVoulez-vous lancer %s en tant qu'application élevée?" - IDS_MUI_ERR_ADMINEXE "Aucun fichier exécutable d'administration trouvé.\nCheck website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Aucun fichier exécutable d'administration trouvé.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Etes-vous sûr de vouloir ouvrir ce gros fichier?" IDS_MUI_ERR_FILE_TOO_LARGE "Ne peut pas gérer cet énorme fichier (taille: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Extension de nom de fichier inconnue (%s) !\nChargement des données quand même?" + "Extension de nom de fichier inconnue (%s)!\nChargement des données quand même?" IDS_MUI_INDENT_CONSISTENT "Le fichier a un retrait cohérent!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activer les paramètres actuels en redémarrant?\n\n%s" + IDS_MUI_RELOADCFGSEX "En poursuivant sans relance, les paramètres enregistrés ne sont pas appliqués et seront remplacés par les paramètres internes à la sortie du programme!" IDS_MUI_EXPORT_FAIL "Erreur d'exportation des paramètres de style vers ""%s""." IDS_MUI_REGEX_INVALID "Erreur lors de l'évaluation de l'expression régulière. L'expression est invalide!" IDS_MUI_DROP_NO_FILE "Aucun nom de fichier valide récupéré.\nSi une application 32 bits est utilisée,\nessayer de faire glisser le fichier sur la barre d'outils de Notepad3." diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 13027df87..d364d8957 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -144,13 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Csak egy fájlt lehet egyszerre ide ejteni!" IDS_MUI_ERR_ACCESSDENIED "A következő fájlt: ""%s"" nem lehet menteni, lehet, hogy védett.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "A következő fájlt: ""%s"" nem lehet menteni, lehet, hogy védett.\n\nSzeretné adminisztrátornként elindítani a Notepad3-at?" - IDS_MUI_ERR_ADMINEXE "Adminisztrátor végrehajtható nem található.\nFelkeressük e weboldalt: https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Adminisztrátor végrehajtható nem található.\nFelkeressük e weboldalt: https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Biztosan meg szeretné nyitni ezt a nagy fájlt?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Ismeretlen fájlkiterjesztés (%s) !\nMindenképpen betöltsem ?" + "Ismeretlen fájlkiterjesztés (%s)!\nMindenképpen betöltsem?" IDS_MUI_INDENT_CONSISTENT "A fájlnak konzisztens behúzásai vannak!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Hiba a színkiemelések beállításainak exportálásakor ide ""%s""." IDS_MUI_REGEX_INVALID "Hiba a reguláris kifejezés feldolgozásakor. A kifejezés érvénytelen!" IDS_MUI_DROP_NO_FILE "Nem sikerült érvényes fájlnevet kapni.\nHa egy 32 bites alkalmazásból lett átdobva,\nkérem, dobja újra a Notepad3 eszköztárra." diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index d85fcaad2..f750d4201 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -144,13 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Solo un file può essere rilasciato con una unica operazione!" IDS_MUI_ERR_ACCESSDENIED "Il file ""%s"" non può essere salvato e potrebbe essere protetto.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "Il file ""%s"" non può essere salvato e potrebbe essere protetto.\n\nVuoi avviare Notepad3 come Administrator?" - IDS_MUI_ERR_ADMINEXE "Nessun eseguibile di administration trovato.\nControllare https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Nessun eseguibile di administration trovato.\nControllare https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Sei sicuro di voler aprire questo file grande?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Estensione sconosciuta (%s) !\nProseguire con il caricamento?" + "Estensione sconosciuta (%s)!\nProseguire con il caricamento?" IDS_MUI_INDENT_CONSISTENT "Il file ha una indentazione consistente!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Errore nell'esportazione degli Stili su ""%s""." IDS_MUI_REGEX_INVALID "Errore nella valutazione della regular expression. La RegExp non è valida!" IDS_MUI_DROP_NO_FILE "Nessun nomefile valido.\nSe stai facendo drag-n-drop da una applicazione 32-bit,\nrilascia il file sulla toolbar di Notepad3." diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 31c467722..9817706d0 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL """%s"" への配色設定のエクスポートに失敗しました。" IDS_MUI_REGEX_INVALID "正規表現の構文が正しくありません!" IDS_MUI_DROP_NO_FILE "読み込んだファイル名が正しくありません。(仮訳)\n32-bitのプログラムからドロップしたのであれば、\nNotepad3のツールバーにドラッグ&&ドロップしてください。" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 7b468637f..e8dce2ed6 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -144,13 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "한 번에 하나의 파일만 끌어서 놓을 수 있습니다.!" IDS_MUI_ERR_ACCESSDENIED """%s"" 파일을 저장할 수 없으며 보호되어 있을 수 있습니다.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) """%s"" 파일을 저장할 수 없으며 보호되어 있을 수 있습니다.\n\n관리자 권한으로 Notepad3을 시작 하시겠습니까?" IDS_MUI_ERR_ADMINEXE "사용 가능한 관리 도구를 찾을 수 없습니다. https://rizonesoft.com 에서 확인 하시겠습니까?" IDS_MUI_WARN_LOAD_BIG_FILE "이 대용량 파일을 열겠습니까?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "알 수 없는 확장자 (%s)!\n데이터를 로딩 하시겠습니까 ?" + "알 수 없는 확장자 (%s)!\n데이터를 로딩 하시겠습니까?" IDS_MUI_INDENT_CONSISTENT "들여쓰기가 일관적입니다!" IDS_MUI_EOLMODENAME_CRLF "윈도우 (CR+LF)" IDS_MUI_EOLMODENAME_LF "유닉스/Mac (LF)" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch ?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "스타일 설정을 ""%s""(으)로 내보내는 중 오류가 발생하였습니다." IDS_MUI_REGEX_INVALID "정규 표현식을 평가하는 중 오류가 발생하였습니다. 표현식이 유효하지 않습니다!" IDS_MUI_DROP_NO_FILE "가져온 파일 이름이 올바르지 않습니다.\n32 비트 응용 프로그램에서 끌어 오는 경우\nNotepad3의 도구 모음에 드래그 앤 드롭하십시오." diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index dcbd0ec39..6cf878bca 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Er kan slechts één bestand tegelijkertijd worden gedeponeerd!" IDS_MUI_ERR_ACCESSDENIED "Het bestand ""%s"" kan niet worden opgeslagen en kan worden beveiligd.\n\nWilt u %s als verhoogde applicatie starten?" - IDS_MUI_ERR_ADMINEXE "Geen administratief uitvoerbaar bestand gevonden.\nControleer website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Geen administratief uitvoerbaar bestand gevonden.\nControleer website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Weet je zeker dat je dit grote bestand wilt openen?" IDS_MUI_ERR_FILE_TOO_LARGE "Kan dat enorme bestand niet aan (grootte: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Onbekende bestandsnaamextensie (%s) !\nGegevens toch laden?" + "Onbekende bestandsnaamextensie (%s)!\nGegevens toch laden?" IDS_MUI_INDENT_CONSISTENT "Het bestand heeft een consistente inspringing!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "De huidige instellingen activeren door opnieuw te starten?\n\n%s" + IDS_MUI_RELOADCFGSEX "Als u doorgaat zonder opnieuw te starten, worden opgeslagen instellingen niet toegepast en worden deze overschreven door interne instellingen bij het afsluiten van het programma!" IDS_MUI_EXPORT_FAIL "Fout bij het exporteren van stijl instellingen naar ""%s""." IDS_MUI_REGEX_INVALID "Fout bij het evalueren van reguliere expressie. Expressie is ongeldig!" IDS_MUI_DROP_NO_FILE "Geen geldige bestandsnaam opgehaald.\nAls een 32-bits toepassing wordt gebruikt,\nprobeer dan het bestand naar de werkbalk Notepad3 te slepen" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 1cb450c82..93dd76222 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -144,13 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Tylko jeden plik może być upuszczony w tym samym czasie!" IDS_MUI_ERR_ACCESSDENIED "Plik ""%s"" nie może zostać zapisany i może być zabezpieczony.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "Plik ""%s"" nie może zostać zapisany i może być zabezpieczony.\n\nCzy uruchomić Notepad3 jako Administrator?" - IDS_MUI_ERR_ADMINEXE "Nie znaleziono narzędzia administracyjnego.\nSprawdź stronę https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Nie znaleziono narzędzia administracyjnego.\nSprawdź stronę https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Czy na pewno chcesz otworzyć ten duży plik?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Nieznane rozszerzenie nazwy pliku (%s) !\nCzy mimo to załadować?" + "Nieznane rozszerzenie nazwy pliku (%s)!\nCzy mimo to załadować?" IDS_MUI_INDENT_CONSISTENT "Ten plik posiada jednolite wcięcie!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Błąd podczas eksportowania ustawień styu do ""%s""." IDS_MUI_REGEX_INVALID "Błąd podczas oceny regularnego wyrażenia. Wyrażenie jest nieuzasadnione!" IDS_MUI_DROP_NO_FILE "Nie rozpoznano żadnej sensownej nazwy pliku.\nJeśli upuścisz aplikację 32-bitową,\nprzeciągnij i upuść do paska narzędzi Notepad3'a." diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index b8b92076f..299aa1aea 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!" IDS_MUI_ERR_ACCESSDENIED "The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??" - IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Unknown file name extension (%s) !\nLoading data anyway ?" + "Unknown file name extension (%s)!\nLoading data anyway?" IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""." IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!" IDS_MUI_DROP_NO_FILE "No valid filename retrieved.\nIf dropping from 32-bit application,\nplease drag and drop to Notepad3's tool bar." diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index a854c94b3..11204b98c 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -144,8 +144,7 @@ BEGIN IDS_MUI_ERR_DROP "За один раз можно перетащить только один файл!" IDS_MUI_ERR_ACCESSDENIED "Файл «%s» не может быть сохранен и может быть защищен.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "Файл «%s» не может быть сохранен и может быть защищен.\n\nХотите запустить Notepad3 от имени Администратора?" - IDS_MUI_ERR_ADMINEXE "Не найден инструмент администратора\nПосетить сайт https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Не найден инструмент администратора\nПосетить сайт https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Вы уверены, что хотите открыть этот очень большой файл?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Ошибка экспорта настроек стилей в «%s»." IDS_MUI_REGEX_INVALID "Ошибка обработки регулярного выражения. Выражение недействительно!" IDS_MUI_DROP_NO_FILE "Не удается получить имя файла. \nЕсли перетаскиваете из 32-битного приложения,\nперетащите на панели инструментов Notepad3." diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index 2089510d3..513f2f0c3 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!" IDS_MUI_ERR_ACCESSDENIED "The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??" - IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Unknown file name extension (%s) !\nLoading data anyway ?" + "Unknown file name extension (%s)!\nLoading data anyway?" IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""." IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!" IDS_MUI_DROP_NO_FILE "No valid filename retrieved.\nIf dropping from 32-bit application,\nplease drag and drop to Notepad3's tool bar." diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 71533d35c..c4b0b1e67 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -144,13 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Endast en fil kan slängas på en gång!" IDS_MUI_ERR_ACCESSDENIED "Filen ""%s"" kan inte sparas och kan vara skyddad.\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "Filen ""%s"" kan inte sparas och kan vara skyddad.\n\nVill du köra Notepad3 som Administratör?" - IDS_MUI_ERR_ADMINEXE "Ingen exekverbar fil för administratör kan hittas.\nGå till websidan https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "Ingen exekverbar fil för administratör kan hittas.\nGå till websidan https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Vill du öppna denna stora fil?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Okändt filnamnstillägg (%s) !\nVill du fortsätta ändå ?" + "Okändt filnamnstillägg (%s)!\nVill du fortsätta ändå?" IDS_MUI_INDENT_CONSISTENT "Filen har konsistent indrag!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Fel vid exportering av stilinställningar ""%s""." IDS_MUI_REGEX_INVALID "Fil vid utvärdering av reguljärt uttryck. Uttrycket är ogiltigt!" IDS_MUI_DROP_NO_FILE "Inget giltigt filnamn kunde hittas.\nOm du drar-och-släpper från en 32-bits applikation,\nvar vänligt släpp på Notepad3s verktygsfält." diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index bf3a33da4..c8ede233b 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -144,12 +144,12 @@ BEGIN IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!" IDS_MUI_ERR_ACCESSDENIED "The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??" - IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?" + IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?" IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %lli MB)!" IDS_MUI_WARN_UNKNOWN_EXT - "Unknown file name extension (%s) !\nLoading data anyway ?" + "Unknown file name extension (%s)!\nLoading data anyway?" IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" @@ -182,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""." IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!" IDS_MUI_DROP_NO_FILE "No valid filename retrieved.\nIf dropping from 32-bit application,\nplease drag and drop to Notepad3's tool bar." diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 6c63acd3b..4eec1ff29 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -118,7 +118,7 @@ BEGIN IDS_MUI_OPENWITH "请选择用于收藏应用程序的文件夹。" IDS_MUI_FAVORITES "请选择用于收藏文件的文件夹。" IDS_MUI_BACKSLASHHELP "反斜杠转义序列：\n\n\\a\t响铃符 (BEL, ASCII 7)\n\\b\t退格符 (BS, ASCII 8)\n\\f\t跳页符 (FF, ASCII 12)\n\\n\t换行符 (LF, ASCII 10)\n\\r\t回车符 (CR, ASCII 13)\n\\t\t水平制表符 (HT, ASCII 9)\n\\v\t垂直制表符 (VT, ASCII 11)\n\\ooo\t八进制数值 ooo 对应的字符\n\\uHHHH\t十六进制数值 HHHH 对应的字符\n\\xHH\t十六进制数值 HH 对应的字符\n\\\\\t反斜杠" - IDS_MUI_REGEXPHELP "正则表达式语法（支持多行匹配）：\n\n.\t任意字符\n^\t行首\n$\t行尾\n\\<\t词首\n\\>\t词尾\n\\b\t词首或词尾\n[...]\t集合（[abc]）或范围（[a-z]）中的任一字符\n[^...]\t除集合或范围以外的任一字符\n\\d\t单个十进制数字\n\\D\t单个除十进制数字以外的任意字符\n\\s\t单个空格字符\n\\S\t单个除空格字符以外的任意字符\n\\w\t任一可出现于标识符中的字符\n\\W\t任一不可出现于标识符中的字符\n\\\\\t反斜杠\n\\xHH\t十六进制数值 HH 对应的字符\n?\t匹配它前面的单元至多 1 次\n*\t匹配它前面的单元 0 次或任意次\n+\t匹配它前面的单元至少 1 次\n*? 和 +?\t非贪婪匹配的 ? 和 +\n(\t分组开始\n)\t分组结束\n\\1 - \\9\t引用指定序号的已匹配分组\n" + IDS_MUI_REGEXPHELP "正则表达式语法（支持多行匹配）：\n\n.\t任意字符\n^\t行首\n$\t行尾\n\\<\t词首\n\\>\t词尾\n\\b\t词首或词尾\n[...]\t集合（[abc]）或范围（[a-z]）中的任一字符\n[^...]\t除集合或范围以外的任一字符\n\\d\t单个十进制数字\n\\D\t单个除十进制数字以外的任意字符\n\\s\t单个空格字符\n\\S\t单个除空格字符以外的任意字符\n\\w\t任一可出现于标识符中的字符\n\\W\t任一不可出现于标识符中的字符\n\\\\\t反斜杠\n\\xHH\t十六进制数值 HH 对应的字符\n?\t匹配它前面的单元至多 1 次\n*\t匹配它前面的单元 0 次或任意次\n+\t匹配它前面的单元至少 1 次\n*? 和 +?\t非贪婪匹配的? 和 +\n(\t分组开始\n)\t分组结束\n\\1 - \\9\t引用指定序号的已匹配分组\n" IDS_MUI_WILDCARDHELP "通配符：\n\n*\t匹配 0 或任意个字符\n?\t匹配恰好一个字符" END @@ -144,7 +144,6 @@ BEGIN IDS_MUI_ERR_DROP "一次只能拖放一个文件。" IDS_MUI_ERR_ACCESSDENIED "文件""%s""不能被保存，它可能是受保护的。\n\nDo you want to launch %s as 'Elevated' application?" -// (to be deleted) "文件""%s""不能被保存，它可能是受保护的。\n\n是否以管理员权限运行 Notepad3？" IDS_MUI_ERR_ADMINEXE "无管理工具可用。\n\n访问 https://rizonesoft.com/ 看看？" IDS_MUI_WARN_LOAD_BIG_FILE "是否确实要打开一个如此庞大的文件？" @@ -183,6 +182,8 @@ END STRINGTABLE BEGIN + IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" + IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" IDS_MUI_EXPORT_FAIL "导出样式设置到文件""%s""时遇到错误。" IDS_MUI_REGEX_INVALID "正则表达式无效。" IDS_MUI_DROP_NO_FILE "未能获取文件名。\n\n如果从 32 位应用程序拖放文件，请拖放到 Notepad3 的工具栏上。" diff --git a/test/test_files/encoding/UTF-8/í (issue #1924).json b/test/test_files/encoding/UTF-8/í (issue #1924).json new file mode 100644 index 000000000..95fe7dea8 --- /dev/null +++ b/test/test_files/encoding/UTF-8/í (issue #1924).json @@ -0,0 +1 @@ +[{"Url":"dummy","Description":"dummy"},{"Url":"http://www.subdivx.com/index.php?buscar=&accion","Description":"Subtítulos"}] \ No newline at end of file diff --git a/test/test_files/encoding/UTF-8/ú (issue #1924).json b/test/test_files/encoding/UTF-8/ú (issue #1924).json new file mode 100644 index 000000000..22771982f --- /dev/null +++ b/test/test_files/encoding/UTF-8/ú (issue #1924).json @@ -0,0 +1 @@ +[{"Url":"dummy","Description":"dummy"},{"Url":"http://www.subdivx.com/index.php?buscar=&accion","Description":"Súbtitulos"}] \ No newline at end of file