Merge branch 'flyer05-master'

bareos · Feb 14, 2017 · b4eed11 · b4eed11
2 parents 2712657 + 3d4421c
commit b4eed11
Show file tree

Hide file tree

Showing 8 changed files with 1,125 additions and 6 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -13,3 +13,4 @@ Braian Bressan
 Jin Zhanbing
 Enes Yalcin
 Serefhan Yeter
+Pavol Vrba
diff --git a/module/Application/language/Makefile.am b/module/Application/language/Makefile.am
@@ -10,8 +10,8 @@ update-po: $(PO)
 
 update-all: webui.pot
 	@(echo 'Updating all *.po files ...';)
-	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU tr_TR; do msgmerge --backup=none -U $$i.po $< && touch $$i.po; done;)
+	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU sk_SK tr_TR; do msgmerge --backup=none -U $$i.po $< && touch $$i.po; done;)
 
 msgfmt-all: webui.pot
 	@(echo 'Generating all *.mo files ...';)
-	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU tr_TR; do msgfmt $$i.po --output-file=$$i.mo; done;)
+	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU sk_SK tr_TR; do msgfmt $$i.po --output-file=$$i.mo; done;)
diff --git a/module/Application/language/Makefile.in b/module/Application/language/Makefile.in
@@ -376,11 +376,11 @@ update-po: $(PO)
 
 update-all: webui.pot
 	@(echo 'Updating all *.po files ...';)
-	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU tr_TR; do msgmerge --backup=none -U $$i.po $< && touch $$i.po; done;)
+	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU sk_SK tr_TR; do msgmerge --backup=none -U $$i.po $< && touch $$i.po; done;)
 
 msgfmt-all: webui.pot
 	@(echo 'Generating all *.mo files ...';)
-	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU tr_TR; do msgfmt $$i.po --output-file=$$i.mo; done;)
+	@(for i in cn_CN de_DE en_EN es_ES fr_FR it_IT nl_BE ru_RU sk_SK tr_TR; do msgfmt $$i.po --output-file=$$i.mo; done;)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/module/Application/language/sk_SK.mo b/module/Application/language/sk_SK.mo