langpacks: unification

16 files changed, 117 insertions, 23 deletions

diff --git a/langpacks/belarusian/Refresh.bat b/langpacks/belarusian/Refresh.bat
index e01751efc9..972d3a4f72 100644
--- a/langpacks/belarusian/Refresh.bat
+++ b/langpacks/belarusian/Refresh.bat
@@ -11,5 +11,8 @@ REM =========================
 cd "..\..\tools\lpgen\"
 call refresher.bat %language% "%oldLangpackPath%"
 
-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)
+REM if previous command failed, exit
+if %ERRORLEVEL% NEQ 0 exit /B 1
+
+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)
 REM call installer.bat %language% "%mirandaPath%"
diff --git a/langpacks/bulgarian/Refresh.bat b/langpacks/bulgarian/Refresh.bat
index 9ecfe2dbd7..0e125045b6 100644
--- a/langpacks/bulgarian/Refresh.bat
+++ b/langpacks/bulgarian/Refresh.bat
@@ -11,5 +11,8 @@ REM =========================
 cd "..\..\tools\lpgen\"

 call refresher.bat %language% "%oldLangpackPath%"

 

-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)

+REM if previous command failed, exit

+if %ERRORLEVEL% NEQ 0 exit /B 1

+

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

 REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/croatian/Refresh.bat b/langpacks/croatian/Refresh.bat
index 57ce204cfc..4f3debe06e 100644
--- a/langpacks/croatian/Refresh.bat
+++ b/langpacks/croatian/Refresh.bat
@@ -11,5 +11,8 @@ REM =========================
 cd "..\..\tools\lpgen\"

 call refresher.bat %language% "%oldLangpackPath%"

 

-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)

+REM if previous command failed, exit

+if %ERRORLEVEL% NEQ 0 exit /B 1

+

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

 REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/czech/Refresh.bat b/langpacks/czech/Refresh.bat
index 67245e5fa3..289ced2779 100644
--- a/langpacks/czech/Refresh.bat
+++ b/langpacks/czech/Refresh.bat
@@ -4,7 +4,7 @@ REM ====== VARIABLES ========
 

 set "language=czech"

 set "oldLangpackPath=Deprecated\old langpack\langpack_czech2.txt"

-REM set "mirandaPath=D:\Programy\Miranda NG"

+set "mirandaPath=D:\Programy\Miranda NG"

 

 REM =========================

 

@@ -14,5 +14,5 @@ call refresher.bat %language% "%oldLangpackPath%"
 REM if previous command failed, exit

 if %ERRORLEVEL% NEQ 0 exit /B 1

 

-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

 REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/english_gb/Refresh.bat b/langpacks/english_gb/Refresh.bat
new file mode 100644
index 0000000000..bdf7cbae1b
--- /dev/null
+++ b/langpacks/english_gb/Refresh.bat
@@ -0,0 +1,18 @@
+@echo off
+
+REM ====== VARIABLES ========
+
+set "language=english_gb"
+set "oldLangpackPath="
+set "mirandaPath="
+
+REM =========================
+
+cd "..\..\tools\lpgen\"
+call refresher.bat %language% "%oldLangpackPath%"
+
+REM if previous command failed, exit
+if %ERRORLEVEL% NEQ 0 exit /B 1
+
+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)
+REM call installer.bat %language% "%mirandaPath%"
diff --git a/langpacks/french/Refresh.bat b/langpacks/french/Refresh.bat
index a5bfe9feca..5b3173af70 100644
--- a/langpacks/french/Refresh.bat
+++ b/langpacks/french/Refresh.bat
@@ -1,4 +1,18 @@
 @echo off

 

+REM ====== VARIABLES ========

+

+set "language=french"

+set "oldLangpackPath=Deprecated\langpack_french.txt"

+set "mirandaPath="

+

+REM =========================

+

 cd "..\..\tools\lpgen\"

-call refresher.bat french Deprecated\langpack_french.txt
\ No newline at end of file
+call refresher.bat %language% "%oldLangpackPath%"

+

+REM if previous command failed, exit

+if %ERRORLEVEL% NEQ 0 exit /B 1

+

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

+REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/german/Refresh.bat b/langpacks/german/Refresh.bat
index 4b82336b34..8f3f087c5c 100644
--- a/langpacks/german/Refresh.bat
+++ b/langpacks/german/Refresh.bat
@@ -1,4 +1,18 @@
 @echo off

 

+REM ====== VARIABLES ========

+

+set "language=german"

+set "oldLangpackPath=Deprecated\langpack_german.txt"

+set "mirandaPath="

+

+REM =========================

+

 cd "..\..\tools\lpgen\"

-call refresher.bat german Deprecated\langpack_german.txt

+call refresher.bat %language% "%oldLangpackPath%"

+

+REM if previous command failed, exit

+if %ERRORLEVEL% NEQ 0 exit /B 1

+

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

+REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/polish/Refresh.bat b/langpacks/polish/Refresh.bat
index b87eb24774..312bad9cf4 100644
--- a/langpacks/polish/Refresh.bat
+++ b/langpacks/polish/Refresh.bat
@@ -11,5 +11,8 @@ REM =========================
 cd "..\..\tools\lpgen\"

 call refresher.bat %language% "%oldLangpackPath%"

 

-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)

+REM if previous command failed, exit

+if %ERRORLEVEL% NEQ 0 exit /B 1

+

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

 REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/russian/Refresh.bat b/langpacks/russian/Refresh.bat
new file mode 100644
index 0000000000..4ec527bbdd
--- /dev/null
+++ b/langpacks/russian/Refresh.bat
@@ -0,0 +1,18 @@
+@echo off
+
+REM ====== VARIABLES ========
+
+set "language=russian"
+set "oldLangpackPath=Deprecated\langpack_russian_old.txt"
+set "mirandaPath="
+
+REM =========================
+
+cd "..\..\tools\lpgen\"
+call refresher.bat %language% "%oldLangpackPath%"
+
+REM if previous command failed, exit
+if %ERRORLEVEL% NEQ 0 exit /B 1
+
+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)
+REM call installer.bat %language% "%mirandaPath%"
diff --git a/langpacks/russian/UpdateLang.bat b/langpacks/russian/UpdateLang.bat
index 15ad6e89c0..a063036d82 100644
--- a/langpacks/russian/UpdateLang.bat
+++ b/langpacks/russian/UpdateLang.bat
@@ -1,9 +1,10 @@
 for %%* in (.) do set CurrDirName=%%~n*

 set langdir=%CD%

 set lang=%CurrDirName%

+set OldLangpackPath=

 

 del /f /q %langdir%\Untranslated\*.txt

 

 pushd ..\..\tools\lpgen

-cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated"

+cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated" /langpack:%OldLangpackPath%

 popd
\ No newline at end of file
diff --git a/langpacks/serbian/Refresh.bat b/langpacks/serbian/Refresh.bat
index da7f958199..0605a5c486 100644
--- a/langpacks/serbian/Refresh.bat
+++ b/langpacks/serbian/Refresh.bat
@@ -11,5 +11,8 @@ REM =========================
 cd "..\..\tools\lpgen\"
 call refresher.bat %language% "%oldLangpackPath%"
 
-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)
+REM if previous command failed, exit
+if %ERRORLEVEL% NEQ 0 exit /B 1
+
+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)
 REM call installer.bat %language% "%mirandaPath%"
diff --git a/langpacks/serbian/UpdateLang.bat b/langpacks/serbian/UpdateLang.bat
deleted file mode 100644
index a063036d82..0000000000
--- a/langpacks/serbian/UpdateLang.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-for %%* in (.) do set CurrDirName=%%~n*

-set langdir=%CD%

-set lang=%CurrDirName%

-set OldLangpackPath=

-

-del /f /q %langdir%\Untranslated\*.txt

-

-pushd ..\..\tools\lpgen

-cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated" /langpack:%OldLangpackPath%

-popd
\ No newline at end of file
diff --git a/langpacks/spanish/Refresh.bat b/langpacks/spanish/Refresh.bat
index d8c1fc5e86..709703f062 100644
--- a/langpacks/spanish/Refresh.bat
+++ b/langpacks/spanish/Refresh.bat
@@ -11,5 +11,8 @@ REM =========================
 cd "..\..\tools\lpgen\"

 call refresher.bat %language% "%oldLangpackPath%"

 

-REM copy and reload langpack in your Miranda (uncoment next line + enable cmdline.dll plugin to use it)

+REM if previous command failed, exit

+if %ERRORLEVEL% NEQ 0 exit /B 1

+

+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)

 REM call installer.bat %language% "%mirandaPath%"

diff --git a/langpacks/spanish/UpdateLang.bat b/langpacks/spanish/UpdateLang.bat
index 15ad6e89c0..a063036d82 100644
--- a/langpacks/spanish/UpdateLang.bat
+++ b/langpacks/spanish/UpdateLang.bat
@@ -1,9 +1,10 @@
 for %%* in (.) do set CurrDirName=%%~n*

 set langdir=%CD%

 set lang=%CurrDirName%

+set OldLangpackPath=

 

 del /f /q %langdir%\Untranslated\*.txt

 

 pushd ..\..\tools\lpgen

-cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated"

+cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated" /langpack:%OldLangpackPath%

 popd
\ No newline at end of file
diff --git a/langpacks/ukrainian/Refresh.bat b/langpacks/ukrainian/Refresh.bat
new file mode 100644
index 0000000000..d167782eeb
--- /dev/null
+++ b/langpacks/ukrainian/Refresh.bat
@@ -0,0 +1,18 @@
+@echo off
+
+REM ====== VARIABLES ========
+
+set "language=ukrainian"
+set "oldLangpackPath=Deprecated\langpack_ukrainian_old.txt"
+set "mirandaPath="
+
+REM =========================
+
+cd "..\..\tools\lpgen\"
+call refresher.bat %language% "%oldLangpackPath%"
+
+REM if previous command failed, exit
+if %ERRORLEVEL% NEQ 0 exit /B 1
+
+REM copy and reload langpack in your Miranda (uncomment next line + enable cmdline.dll plugin to use it)
+REM call installer.bat %language% "%mirandaPath%"
diff --git a/langpacks/ukrainian/UpdateLang.bat b/langpacks/ukrainian/UpdateLang.bat
index 296cc1df5d..a063036d82 100644
--- a/langpacks/ukrainian/UpdateLang.bat
+++ b/langpacks/ukrainian/UpdateLang.bat
@@ -1,8 +1,10 @@
 for %%* in (.) do set CurrDirName=%%~n*

 set langdir=%CD%

 set lang=%CurrDirName%

+set OldLangpackPath=

+

 del /f /q %langdir%\Untranslated\*.txt

 

 pushd ..\..\tools\lpgen

-cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated"

+cscript /nologo translate.js /sourcelang:"%lang%" /noref:"yes" /popuntranslated:"yes" /out:"%langdir%" /untranslated:"%langdir%\Untranslated" /langpack:%OldLangpackPath%

 popd
\ No newline at end of file