Skip to content

Commit 61dfef5

Browse files
matthewyang204matthewyang204
committed
Merge branch 'master' of github.com:matthewyang204/NotepadNext
2 parents bdf9ed5 + 7cc9fb2 commit 61dfef5

26 files changed

+421
-199
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout Repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
submodules: true
2929

@@ -79,6 +79,12 @@ jobs:
7979
cd build
8080
jom package
8181
82+
- name: Install NSIS
83+
if: runner.os == 'Windows'
84+
uses: repolevedavaj/install-nsis@v1.1.0
85+
with:
86+
nsis-version: '3.11'
87+
8288
- name: Create Windows Installer
8389
if: runner.os == 'Windows'
8490
run: |
@@ -137,14 +143,14 @@ jobs:
137143

138144
steps:
139145
- name: Checkout Repository
140-
uses: actions/checkout@v4
146+
uses: actions/checkout@v5
141147

142148
- name: Create Draft Release
143149
run: |
144150
gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --generate-notes --draft
145151
146152
- name: Download all artifacts
147-
uses: actions/download-artifact@v4
153+
uses: actions/download-artifact@v5
148154

149155
- name: Upload Windows Installer
150156
run: |

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Check for spelling errors
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- uses: codespell-project/actions-codespell@master
1717
with:

‎.github/workflows/create_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
token: ${{ secrets.CREATE_RELEASE_TOKEN }}
2020

‎.github/workflows/label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
pull-requests: write
1818

1919
steps:
20-
- uses: actions/labeler@v5
20+
- uses: actions/labeler@v6
2121
with:
2222
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/lupdate.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
with:
1616
submodules: true
1717

@@ -24,7 +24,7 @@ jobs:
2424
run: lupdate src/NotepadNext.pro
2525

2626
- name: Commit translation changes
27-
uses: stefanzweifel/git-auto-commit-action@v6
27+
uses: stefanzweifel/git-auto-commit-action@v7
2828
with:
2929
commit_message: Update translation files
3030
file_pattern: 'i18n/*.ts'

‎.github/workflows/post_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- run: |
1616
gh issue create --title "Publish Windows Release for $RELEASE_TAG" --body "Update json file in root of project."

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ CMakeLists.txt.user*
4949

5050
/build
5151
/build*
52+
build/
53+
build*/
5254
/icon/*.png
5355
/icon/ImageMagick
5456

‎i18n/NotepadNext_cs.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,6 +2075,7 @@
20752075
</message>
20762076
<message>
20772077
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1180"/>
2078+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
20782079
<source>Reload File</source>
20792080
<translation>Znovu načíst soubor</translation>
20802081
</message>
@@ -2125,22 +2126,27 @@
21252126
<translation>Administrator</translation>
21262127
</message>
21272128
<message>
2128-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1872"/>
2129+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
2130+
<source>&lt;b&gt;%1&lt;/b&gt; has been modified by another program. Do you want to reload it?</source>
2131+
<translation type="unfinished"></translation>
2132+
</message>
2133+
<message>
2134+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
21292135
<source>Error Saving File</source>
21302136
<translation>Chyba při ukládání souboru</translation>
21312137
</message>
21322138
<message>
2133-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1872"/>
2139+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
21342140
<source>An error occurred when saving &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Error: %2</source>
21352141
<translation>Při ukládání &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Chyba: %2 došlo k chybě</translation>
21362142
</message>
21372143
<message>
2138-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1878"/>
2144+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1886"/>
21392145
<source>Zoom: %1%</source>
21402146
<translation>Lupa: %1%</translation>
21412147
</message>
21422148
<message>
2143-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2045"/>
2149+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2053"/>
21442150
<source>No updates are available at this time.</source>
21452151
<translation>V tuto chvíli nejsou k dispozici žádné aktualizace.</translation>
21462152
</message>
@@ -2373,22 +2379,22 @@
23732379
<translation>Zkopírujte výsledek do schránky</translation>
23742380
</message>
23752381
<message>
2376-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="61"/>
2382+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="57"/>
23772383
<source>Collapse All</source>
23782384
<translation>Sbalit vše</translation>
23792385
</message>
23802386
<message>
2381-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="62"/>
2387+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="58"/>
23822388
<source>Expand All</source>
23832389
<translation>Rozbalit vše</translation>
23842390
</message>
23852391
<message>
2386-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="64"/>
2392+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="60"/>
23872393
<source>Delete Entry</source>
23882394
<translation>Smazat záznam</translation>
23892395
</message>
23902396
<message>
2391-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="66"/>
2397+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="62"/>
23922398
<source>Delete All</source>
23932399
<translation>Smazat vše</translation>
23942400
</message>

‎i18n/NotepadNext_es.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,6 +2070,7 @@
20702070
</message>
20712071
<message>
20722072
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1180"/>
2073+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
20732074
<source>Reload File</source>
20742075
<translation>Volver a cargar archivo</translation>
20752076
</message>
@@ -2120,22 +2121,27 @@
21202121
<translation>Administrador</translation>
21212122
</message>
21222123
<message>
2123-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1872"/>
2124+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
2125+
<source>&lt;b&gt;%1&lt;/b&gt; has been modified by another program. Do you want to reload it?</source>
2126+
<translation type="unfinished"></translation>
2127+
</message>
2128+
<message>
2129+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
21242130
<source>Error Saving File</source>
21252131
<translation>Error al guardar archivo</translation>
21262132
</message>
21272133
<message>
2128-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1872"/>
2134+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
21292135
<source>An error occurred when saving &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Error: %2</source>
21302136
<translation>Ocurrió un error al guardar &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Error: %2</translation>
21312137
</message>
21322138
<message>
2133-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1878"/>
2139+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1886"/>
21342140
<source>Zoom: %1%</source>
21352141
<translation>Zoom: %1%</translation>
21362142
</message>
21372143
<message>
2138-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2045"/>
2144+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2053"/>
21392145
<source>No updates are available at this time.</source>
21402146
<translation>No hay actualizaciones disponibles en este momento.</translation>
21412147
</message>
@@ -2367,22 +2373,22 @@
23672373
<translation>Copiar resultados al portapapeles</translation>
23682374
</message>
23692375
<message>
2370-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="61"/>
2376+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="57"/>
23712377
<source>Collapse All</source>
23722378
<translation>Colapsar todo</translation>
23732379
</message>
23742380
<message>
2375-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="62"/>
2381+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="58"/>
23762382
<source>Expand All</source>
23772383
<translation>Expandir todo</translation>
23782384
</message>
23792385
<message>
2380-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="64"/>
2386+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="60"/>
23812387
<source>Delete Entry</source>
23822388
<translation>Borrar entrada</translation>
23832389
</message>
23842390
<message>
2385-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="66"/>
2391+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="62"/>
23862392
<source>Delete All</source>
23872393
<translation>Borrar todo</translation>
23882394
</message>

‎i18n/NotepadNext_pl.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,7 @@
20712071
</message>
20722072
<message>
20732073
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1180"/>
2074+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
20742075
<source>Reload File</source>
20752076
<translation>Wczytaj plik ponownie</translation>
20762077
</message>
@@ -2121,22 +2122,27 @@
21212122
<translation>Administrator</translation>
21222123
</message>
21232124
<message>
2124-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1872"/>
2125+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
2126+
<source>&lt;b&gt;%1&lt;/b&gt; has been modified by another program. Do you want to reload it?</source>
2127+
<translation type="unfinished"></translation>
2128+
</message>
2129+
<message>
2130+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
21252131
<source>Error Saving File</source>
21262132
<translation>Błąd podczas zapisywania pliku</translation>
21272133
</message>
21282134
<message>
2129-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1872"/>
2135+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
21302136
<source>An error occurred when saving &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Error: %2</source>
21312137
<translation>Pojawił się błąd podczas próby zapisania &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Błąd: %2</translation>
21322138
</message>
21332139
<message>
2134-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1878"/>
2140+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1886"/>
21352141
<source>Zoom: %1%</source>
21362142
<translation>Powiększenie: %1%</translation>
21372143
</message>
21382144
<message>
2139-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2045"/>
2145+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2053"/>
21402146
<source>No updates are available at this time.</source>
21412147
<translation>Brak dostępnych aktualizacji.</translation>
21422148
</message>
@@ -2368,22 +2374,22 @@
23682374
<translation type="unfinished"></translation>
23692375
</message>
23702376
<message>
2371-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="61"/>
2377+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="57"/>
23722378
<source>Collapse All</source>
23732379
<translation>Zwiń wszystko</translation>
23742380
</message>
23752381
<message>
2376-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="62"/>
2382+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="58"/>
23772383
<source>Expand All</source>
23782384
<translation>Rozwiń wszystko</translation>
23792385
</message>
23802386
<message>
2381-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="64"/>
2387+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="60"/>
23822388
<source>Delete Entry</source>
23832389
<translation>Usuń wpis</translation>
23842390
</message>
23852391
<message>
2386-
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="66"/>
2392+
<location filename="../src/NotepadNext/docks/SearchResultsDock.cpp" line="62"/>
23872393
<source>Delete All</source>
23882394
<translation>Usuń wszystko</translation>
23892395
</message>

0 commit comments

Comments
 (0)