Skip to content

Commit 43b0487

Browse files
matthewyang204matthewyang204
authored
Merge branch 'master' into master
2 parents 448e635 + 9e8f97b commit 43b0487

12 files changed

+1142
-242
lines changed

‎i18n/NotepadNext_cs.ts‎

Lines changed: 97 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@
958958
</message>
959959
<message>
960960
<location filename="../src/NotepadNext/dialogs/MainWindow.ui" line="69"/>
961-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1414"/>
961+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1425"/>
962962
<source>Export As</source>
963963
<translation>Exportovat jako</translation>
964964
</message>
@@ -2096,14 +2096,14 @@
20962096
<translation>&lt;b&gt;%1&lt;/b&gt; neexistuje. Chcete jej vytvořit?</translation>
20972097
</message>
20982098
<message>
2099-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1108"/>
2100-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1206"/>
2099+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1114"/>
2100+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1217"/>
21012101
<source>Save file &lt;b&gt;%1&lt;/b&gt;?</source>
21022102
<translation>Uložit soubor &lt;b&gt;%1&lt;/b&gt;?</translation>
21032103
</message>
21042104
<message>
2105-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1109"/>
2106-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1207"/>
2105+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1115"/>
2106+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1218"/>
21072107
<source>Save File</source>
21082108
<translation>Uložit soubor</translation>
21092109
</message>
@@ -2113,79 +2113,154 @@
21132113
<translation>Otevřít složku jako pracovní prostor</translation>
21142114
</message>
21152115
<message>
2116-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1180"/>
2117-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
2116+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1191"/>
2117+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1869"/>
21182118
<source>Reload File</source>
21192119
<translation>Znovu načíst soubor</translation>
21202120
</message>
21212121
<message>
2122-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1180"/>
2122+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1191"/>
21232123
<source>Are you sure you want to reload &lt;b&gt;%1&lt;/b&gt;? Any unsaved changes will be lost.</source>
21242124
<translation>Opravdu chcete znovu načíst &lt;b&gt;%1&lt;/b&gt;? Všechny neuložené změny budou ztraceny.</translation>
21252125
</message>
21262126
<message>
2127-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1381"/>
2127+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1392"/>
21282128
<source>Save a Copy As</source>
21292129
<translation>Uložit kopii jako</translation>
21302130
</message>
21312131
<message>
2132-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1455"/>
2133-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1470"/>
2132+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1466"/>
2133+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1481"/>
21342134
<source>Rename</source>
21352135
<translation>Přejmenovat</translation>
21362136
</message>
21372137
<message>
2138-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1470"/>
2138+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1481"/>
21392139
<source>Name:</source>
21402140
<translation>Jméno:</translation>
21412141
</message>
21422142
<message>
2143-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1490"/>
2143+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1501"/>
21442144
<source>Delete File</source>
21452145
<translation>Smazat soubor</translation>
21462146
</message>
21472147
<message>
2148-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1490"/>
2148+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1501"/>
21492149
<source>Are you sure you want to move &lt;b&gt;%1&lt;/b&gt; to the trash?</source>
21502150
<translation>Opravdu chcete přesunout &lt;b&gt;%1&lt;/b&gt; do koše?</translation>
21512151
</message>
21522152
<message>
2153-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1500"/>
2153+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1511"/>
21542154
<source>Error Deleting File</source>
21552155
<translation>Chyba při mazání souboru</translation>
21562156
</message>
21572157
<message>
2158-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1500"/>
2158+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1511"/>
21592159
<source>Something went wrong deleting &lt;b&gt;%1&lt;/b&gt;?</source>
21602160
<translation>Při mazání &lt;b&gt;%1&lt;/b&gt; se něco pokazilo?</translation>
21612161
</message>
21622162
<message>
2163-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1597"/>
2163+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1608"/>
21642164
<source>Administrator</source>
21652165
<translation>Administrator</translation>
21662166
</message>
21672167
<message>
2168-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1858"/>
2168+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1869"/>
21692169
<source>&lt;b&gt;%1&lt;/b&gt; has been modified by another program. Do you want to reload it?</source>
21702170
<translation type="unfinished"></translation>
21712171
</message>
21722172
<message>
2173-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
2173+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1895"/>
2174+
<source>Read error</source>
2175+
<translation type="unfinished"></translation>
2176+
</message>
2177+
<message>
2178+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1896"/>
2179+
<source>Write error</source>
2180+
<translation type="unfinished"></translation>
2181+
</message>
2182+
<message>
2183+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1897"/>
2184+
<source>Fatal error</source>
2185+
<translation type="unfinished"></translation>
2186+
</message>
2187+
<message>
2188+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1898"/>
2189+
<source>Resource error</source>
2190+
<translation type="unfinished"></translation>
2191+
</message>
2192+
<message>
2193+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1899"/>
2194+
<source>Open error</source>
2195+
<translation type="unfinished"></translation>
2196+
</message>
2197+
<message>
2198+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1900"/>
2199+
<source>Abort error</source>
2200+
<translation type="unfinished"></translation>
2201+
</message>
2202+
<message>
2203+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1901"/>
2204+
<source>Timeout error</source>
2205+
<translation type="unfinished"></translation>
2206+
</message>
2207+
<message>
2208+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1902"/>
2209+
<source>Unspecified error</source>
2210+
<translation type="unfinished"></translation>
2211+
</message>
2212+
<message>
2213+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1903"/>
2214+
<source>Remove error</source>
2215+
<translation type="unfinished"></translation>
2216+
</message>
2217+
<message>
2218+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1904"/>
2219+
<source>Rename error</source>
2220+
<translation type="unfinished"></translation>
2221+
</message>
2222+
<message>
2223+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1905"/>
2224+
<source>Position error</source>
2225+
<translation type="unfinished"></translation>
2226+
</message>
2227+
<message>
2228+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1906"/>
2229+
<source>Resize error</source>
2230+
<translation type="unfinished"></translation>
2231+
</message>
2232+
<message>
2233+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1907"/>
2234+
<source>Permissions error</source>
2235+
<translation type="unfinished"></translation>
2236+
</message>
2237+
<message>
2238+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1908"/>
2239+
<source>Copy error</source>
2240+
<translation type="unfinished"></translation>
2241+
</message>
2242+
<message>
2243+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1909"/>
2244+
<source>Unknown error (%1)</source>
2245+
<translation type="unfinished"></translation>
2246+
</message>
2247+
<message>
2248+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1912"/>
21742249
<source>Error Saving File</source>
21752250
<translation>Chyba při ukládání souboru</translation>
21762251
</message>
21772252
<message>
2178-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1880"/>
2253+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1913"/>
21792254
<source>An error occurred when saving &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Error: %2</source>
21802255
<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>
21812256
</message>
21822257
<message>
2183-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1886"/>
2258+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1919"/>
21842259
<source>Zoom: %1%</source>
21852260
<translation>Lupa: %1%</translation>
21862261
</message>
21872262
<message>
2188-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2053"/>
2263+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2086"/>
21892264
<source>No updates are available at this time.</source>
21902265
<translation>V tuto chvíli nejsou k dispozici žádné aktualizace.</translation>
21912266
</message>

‎i18n/NotepadNext_de.ts‎

Lines changed: 95 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@
922922
</message>
923923
<message>
924924
<location filename="../src/NotepadNext/dialogs/MainWindow.ui" line="69"/>
925-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1420"/>
925+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1425"/>
926926
<source>Export As</source>
927927
<translation>Exportieren als</translation>
928928
</message>
@@ -2063,13 +2063,13 @@
20632063
</message>
20642064
<message>
20652065
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1114"/>
2066-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1212"/>
2066+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1217"/>
20672067
<source>Save file &lt;b&gt;%1&lt;/b&gt;?</source>
20682068
<translation>Datei &lt;b&gt;%1&lt;/b&gt; speichern?</translation>
20692069
</message>
20702070
<message>
20712071
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1115"/>
2072-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1213"/>
2072+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1218"/>
20732073
<source>Save File</source>
20742074
<translation>Datei speichern</translation>
20752075
</message>
@@ -2079,79 +2079,154 @@
20792079
<translation>Ordner als Arbeitsbereich öffnen</translation>
20802080
</message>
20812081
<message>
2082-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1186"/>
2083-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1864"/>
2082+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1191"/>
2083+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1869"/>
20842084
<source>Reload File</source>
20852085
<translation>Datei neu laden</translation>
20862086
</message>
20872087
<message>
2088-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1186"/>
2088+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1191"/>
20892089
<source>Are you sure you want to reload &lt;b&gt;%1&lt;/b&gt;? Any unsaved changes will be lost.</source>
20902090
<translation>Möchten Sie &lt;b&gt;%1&lt;/b&gt; wirklich neu laden? Alle nicht gespeicherten Änderungen gehen verloren.</translation>
20912091
</message>
20922092
<message>
2093-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1387"/>
2093+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1392"/>
20942094
<source>Save a Copy As</source>
20952095
<translation>Kopie speichern unter</translation>
20962096
</message>
20972097
<message>
2098-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1461"/>
2099-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1476"/>
2098+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1466"/>
2099+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1481"/>
21002100
<source>Rename</source>
21012101
<translation>Umbenennen</translation>
21022102
</message>
21032103
<message>
2104-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1476"/>
2104+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1481"/>
21052105
<source>Name:</source>
21062106
<translation>Name:</translation>
21072107
</message>
21082108
<message>
2109-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1496"/>
2109+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1501"/>
21102110
<source>Delete File</source>
21112111
<translation>Datei löschen</translation>
21122112
</message>
21132113
<message>
2114-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1496"/>
2114+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1501"/>
21152115
<source>Are you sure you want to move &lt;b&gt;%1&lt;/b&gt; to the trash?</source>
21162116
<translation>Möchten Sie &lt;b&gt;%1&lt;/b&gt; wirklich in den Papierkorb verschieben?</translation>
21172117
</message>
21182118
<message>
2119-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1506"/>
2119+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1511"/>
21202120
<source>Error Deleting File</source>
21212121
<translation>Fehler beim Löschen der Datei</translation>
21222122
</message>
21232123
<message>
2124-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1506"/>
2124+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1511"/>
21252125
<source>Something went wrong deleting &lt;b&gt;%1&lt;/b&gt;?</source>
21262126
<translation>Beim Löschen von &lt;b&gt;%1&lt;/b&gt; ist ein Fehler aufgetreten?</translation>
21272127
</message>
21282128
<message>
2129-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1603"/>
2129+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1608"/>
21302130
<source>Administrator</source>
21312131
<translation>Administrator</translation>
21322132
</message>
21332133
<message>
2134-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1864"/>
2134+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1869"/>
21352135
<source>&lt;b&gt;%1&lt;/b&gt; has been modified by another program. Do you want to reload it?</source>
21362136
<translation>&lt;b&gt;%1&lt;/b&gt; wurde von einem anderen Programm geändert. Möchten Sie es neu laden?</translation>
21372137
</message>
21382138
<message>
2139-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1886"/>
2139+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1895"/>
2140+
<source>Read error</source>
2141+
<translation type="unfinished"></translation>
2142+
</message>
2143+
<message>
2144+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1896"/>
2145+
<source>Write error</source>
2146+
<translation type="unfinished"></translation>
2147+
</message>
2148+
<message>
2149+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1897"/>
2150+
<source>Fatal error</source>
2151+
<translation type="unfinished"></translation>
2152+
</message>
2153+
<message>
2154+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1898"/>
2155+
<source>Resource error</source>
2156+
<translation type="unfinished"></translation>
2157+
</message>
2158+
<message>
2159+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1899"/>
2160+
<source>Open error</source>
2161+
<translation type="unfinished"></translation>
2162+
</message>
2163+
<message>
2164+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1900"/>
2165+
<source>Abort error</source>
2166+
<translation type="unfinished"></translation>
2167+
</message>
2168+
<message>
2169+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1901"/>
2170+
<source>Timeout error</source>
2171+
<translation type="unfinished"></translation>
2172+
</message>
2173+
<message>
2174+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1902"/>
2175+
<source>Unspecified error</source>
2176+
<translation type="unfinished"></translation>
2177+
</message>
2178+
<message>
2179+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1903"/>
2180+
<source>Remove error</source>
2181+
<translation type="unfinished"></translation>
2182+
</message>
2183+
<message>
2184+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1904"/>
2185+
<source>Rename error</source>
2186+
<translation type="unfinished"></translation>
2187+
</message>
2188+
<message>
2189+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1905"/>
2190+
<source>Position error</source>
2191+
<translation type="unfinished"></translation>
2192+
</message>
2193+
<message>
2194+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1906"/>
2195+
<source>Resize error</source>
2196+
<translation type="unfinished"></translation>
2197+
</message>
2198+
<message>
2199+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1907"/>
2200+
<source>Permissions error</source>
2201+
<translation type="unfinished"></translation>
2202+
</message>
2203+
<message>
2204+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1908"/>
2205+
<source>Copy error</source>
2206+
<translation type="unfinished"></translation>
2207+
</message>
2208+
<message>
2209+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1909"/>
2210+
<source>Unknown error (%1)</source>
2211+
<translation type="unfinished"></translation>
2212+
</message>
2213+
<message>
2214+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1912"/>
21402215
<source>Error Saving File</source>
21412216
<translation>Fehler beim Speichern der Datei</translation>
21422217
</message>
21432218
<message>
2144-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1886"/>
2219+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1913"/>
21452220
<source>An error occurred when saving &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Error: %2</source>
21462221
<translation>Beim Speichern ist ein Fehler aufgetreten &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fehler: %2</translation>
21472222
</message>
21482223
<message>
2149-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1892"/>
2224+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="1919"/>
21502225
<source>Zoom: %1%</source>
21512226
<translation>Zoom: %1%</translation>
21522227
</message>
21532228
<message>
2154-
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2059"/>
2229+
<location filename="../src/NotepadNext/dialogs/MainWindow.cpp" line="2086"/>
21552230
<source>No updates are available at this time.</source>
21562231
<translation>Derzeit sind keine Updates verfügbar.</translation>
21572232
</message>

0 commit comments

Comments
 (0)