lang: correctly merge from master

028e4f9d · Franco Fichtner · d894b8f0 · 028e4f9d · 028e4f9d
Commit 028e4f9d authored Aug 05, 2015 by Franco Fichtner
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Makefile lang/Makefile +1 -1

fr_FR.po lang/fr_FR.po +1 -0

No files found.
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -9,7 +9,7 @@ MSGMERGE=	${_MSGMERGE} -U -N --backup=off

 LOCALEDIR=	/usr/local/share/locale/%%LANG%%/LC_MESSAGES

-LANGUAGES=	de_DE es_CO fr_FR ja_JP zh_CN
+LANGUAGES=	de_DE ja_JP zh_CN
 TEMPLATE=	en_US
 INSTALL=
 MERGE=

--- a/lang/fr_FR.po
+++ b/lang/fr_FR.po
@@ -31617,4 +31617,5 @@ msgstr "Assistant OpenVPN %s"
 #
 # File: src/www/wizards/openvpn_wizard.inc, line: 637
 # File: src/www/wizards/openvpn_wizard.inc, line: 652
+msgid "OpenVPN Wizard"
 msgstr "Assistant de configuration pour OpenVPN"