mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-14 21:09:05 +08:00
Merge pull request #2516 from RaiKoHoff/grepWin_Integration
Small correction to grepWinNP3 component
This commit is contained in:
commit
ea9f626cfd
@ -419,7 +419,7 @@ BEGIN
|
||||
IDS_ERR_INVALID_PATH "Invalid path!"
|
||||
IDS_PROGRAMS "Programs"
|
||||
IDS_ALLFILES "All Files"
|
||||
IDS_BACKUPINFOLDER_TT "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
IDS_BACKUPINFOLDER_TT "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
IDS_SHIFT_NOTSEARCH "hold down the shift key to find files that DO NOT contain the search string"
|
||||
IDS_FILEEXT "Ext"
|
||||
IDS_DARKMODE_TT "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
//#pragma message(__LOC__"Run the NAnt script to get proper version info")
|
||||
|
||||
#define FILEVER 2, 1, 2, 17
|
||||
#define PRODUCTVER 2, 1, 2, 17
|
||||
#define STRFILEVER "2.1.2.17\0"
|
||||
#define STRPRODUCTVER "2.1.2.17\0"
|
||||
#define FILEVER 2, 1, 3, 18
|
||||
#define PRODUCTVER 2, 1, 3, 18
|
||||
#define STRFILEVER "2.1.3.18\0"
|
||||
#define STRPRODUCTVER "2.1.3.18\0"
|
||||
|
||||
#define GREPWIN_VERMAJOR 2
|
||||
#define GREPWIN_VERMINOR 1
|
||||
#define GREPWIN_VERMICRO 2
|
||||
#define GREPWIN_VERBUILD 17
|
||||
#define GREPWIN_VERDATE "2020-07-12"
|
||||
#define GREPWIN_VERMICRO 3
|
||||
#define GREPWIN_VERBUILD 18
|
||||
#define GREPWIN_VERDATE "2020-07-14"
|
||||
|
||||
@ -171,7 +171,6 @@
|
||||
#define IDC_UPDATELINK 1087
|
||||
#define IDC_DOUPDATECHECKS 1088
|
||||
#define IDC_CAPTURESEARCH 1089
|
||||
#define IDC_EDIT1 1090
|
||||
#define IDC_NUMNULL 1090
|
||||
|
||||
#define IDC_RESETDEFAULT 3000
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Wenn aktiviert, wird ein Backup-Ordner innerhalb des Ordners erstellt, in dem gesucht/ersetzt wird, und die Dateien werden in diesen Ordner gesichert."
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "si está activado, una carpeta de respaldo se crea dentro de la cual se busca/reemplaza, y los archivos son colocados en esta"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Si está activado, una carpeta de respaldo se crea dentro de la cual se busca/reemplaza, y los archivos son respaldados en esta"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "si activé, un sous-dossier backup est créé dans le dossier des recherches / les remplacements sont réalisés, et les fichiers y sont sauvegardés"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Se abilitato, viene creata una cartella di backup all'interno della cartella in cui viene eseguita la ricerca/sostituzione, e i file vengono copiati in tale cartella"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Ha ez be van kapcsolva, akkor egy mentési könyvtár kerül létrehozásra a keresési/csere mappa alá, s a mentés ide kerül"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "indien ingeschakeld, wordt er een backup map gemaakt in de map die wordt doorzocht/vervangen en van de bestanden wordt een backup gemaakt in die map"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Jeśli opcja jest włączona, folder kopii zapasowej jest tworzony wewnątrz folderu, który jest przeszukiwany/zastępowany, a pliki są archiwizowane w tym folderze"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Se activado, é criada uma pasta de seguranças dentro da pasta em que é pesquisada/substituída e as seguranças dos ficheiros são feitas nessa pasta"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Se ativado, uma pasta de backup é criada dentro da pasta que é pesquisada/substituída, e os backups dos arquivos serão feitos nesta pasta"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Ak je povolené, vytvorí sa v priečinku, v ktorom sa vyhľadáva/nahrádza, záložný priečinok a súbory sa zálohujú do tohto priečinka"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "En mapp med en säkerhetskopia skapas innuti mappen du söker i, och filer säkerhetskopieras skapas för filerna till denna mapp"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "grepWinNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Etkinleştirildiğinde, aranan/değiştirilen klasörün içinde bir yedekleme klasörü oluşturulur ve dosyalar bu klasöre yedeklenir"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Εάν είναι ενεργοποιημένο, δημιουργείται ένας εφεδρικός φάκελος μέσα στον φάκελο στον οποίο γίνεται αναζήτηση/αντικατάσταση και δημιουργούνται αντίγραφα ασφαλείας σε αυτόν τον φάκελο"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Калі ўключана, папка з бэкапам ствараецца ўнутры папкі пошука/замены, і файлы капіруюцца ў гэту папку"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "Если включено, папка с бэкапом создается внутри папки поиска/замены, и файлы копируются в эту папку"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "有効にすると、検索/置換を行ったフォルダ内にバックアップ用フォルダが作成され、そのフォルダ内にファイルがバックアップされます。"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "如果启用, 则在要查找/替换的目录内创建一个备份目录,并将文件备份到该目录。"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr ""
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -219,7 +219,7 @@ msgid "GREPWINNP3"
|
||||
msgstr "GREPWINNP3"
|
||||
|
||||
#. Resource IDs: (156)
|
||||
msgid "if enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
|
||||
msgstr "설정된 경우, 검색/덮어씌워진 위치에 백업 폴더가 생성되어 파일들을 백업합니다"
|
||||
|
||||
#. Resource IDs: (1050)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<setenv>
|
||||
<variable name="MajorVersion" value="2" />
|
||||
<variable name="MinorVersion" value="0" />
|
||||
<variable name="MicroVersion" value="2" />
|
||||
<variable name="MicroVersion" value="3" />
|
||||
<variable name="WCREV" value="$WCLOGCOUNT$" />
|
||||
<variable name="WCDATE" value="$WCDATE$" />
|
||||
</setenv>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user