From 6fd35b6da6ee836971b23d84eb9e2b4beb3bb1c6 Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Tue, 3 May 2016 09:46:05 +0000
Subject: [PATCH] =?UTF-8?q?#244:=20Copiar=20ficheros=20de=20idiomas=20a=20?=
 =?UTF-8?q?la=20localizaci=C3=B3n=20correcta=20y=20nuevo=20Browser=20con?=
 =?UTF-8?q?=20todas=20las=20cadenas=20preparadas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4915 a21b9725-9963-47de-94b9-378ad31fedc9
---
 po/ca/LC_MESSAGES/browser.mo | Bin 821 -> 0 bytes
 po/en/LC_MESSAGES/browser.mo | Bin 2106 -> 0 bytes
 src/main.cpp                 |  15 +++++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 po/ca/LC_MESSAGES/browser.mo
 delete mode 100644 po/en/LC_MESSAGES/browser.mo

diff --git a/po/ca/LC_MESSAGES/browser.mo b/po/ca/LC_MESSAGES/browser.mo
deleted file mode 100644
index 68bcb6801a36fbe075145cd5659f3743eda0201f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 821
zcmZXR&2AGh6on0xpN@b^2#HORETphOo=nmdMbm<shEPRHnkt!giR4Vo)M&;Iwv)8H
z2OD0aTXxy<0&G~bL4pNa#Bpc|KbDR@%f3F>_W5*Y<t@PopmivRZb9!MKfXdYp>NO{
z^aHvI-M&P~b?`2D16)663H19Rcnz$955O(3fL=h}@55zyfFHpX@H6QBzJUHN-$Cz7
zuKe;_1^xaScptn6!fMgO*ZYB`g_ocEv%cQn#gA18mV}hXCEDaB<7%YI!~Kbva+(NJ
zNX2u~IBE}iq%qXSaYLG1r6R|q^-81@ztWM`X)@rs9C31Jbxcc^vez?9kDVLG<+7Dd
z>X{gZsV>R^IWQVW9cz!+kuX+j71Q2Ws6Ay*Ep6sfC`WgVo>^gNC9H%|&=+HLXI-1g
z5!;<)mL+I&Zm)4R^Jhb0gM(hennrMRRO}gdBBs@-@|Z<6R;|-YEv{}pimFkBLe>{k
z>D&KRx5=UnT8Vzwb+~mbF<jZ4J8fdx=f(U?(QZih=4XX?L$?htw8}K*I}?A2r$L9S
zY{E0a62Xg@HXBK!)7Yomoz6}!Lv6BUNla57blct5@-zI4n_4;i14~ZFc!Cort~}1U
zR9iGX=Ee&5<S=>8>dQKR!<WLamP++Vsw}4Up>)ATv_@pyAzJ-!vZOKnGg!8W_T(bk
TTv$g2DDc_N-`W4NUB>zoo~X)^

diff --git a/po/en/LC_MESSAGES/browser.mo b/po/en/LC_MESSAGES/browser.mo
deleted file mode 100644
index 230198d91a5d84d4e8670afa1f65b6a2d62c71a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2106
zcmZvc%Z?jG6ov~JAec)akYNFVA}}MQN%z=85{;Y$B^f3YOP-57o*<Ux?&EeP<*H6q
z^*EkKK!_c@01L!AFMt%m3jhl?Y<LGGcKpYeI8kW1{q^P4xz^u*omu)$;CL73`#68c
z`6144p2HuGQ_l<W8u$u$8e9fn1XsbA!3*Fi@ZyZuzzev)1+Ieu{0RI3JO};)o&o;`
z8{j`6$NlsLAwB`O!EeF4;CtY|;92nO(lqWG$m<#)$IZZ(Km(o!12{zP--9*WFX83u
z;AxQaJqL3BD<FPi4SxtBHb7o~8LWd}ft=UZ;0NH3;2YqtU<&>Lay?6M%Dp=eTCfQ&
zgFk^>=g%O=`wirEe}Y&lP9b^bY4Brk8RVApT0Y*v`Re2fy$9dI$@Q==UdIR5h4xJj
zo()Q#)c7{Yz2UxbZahEEh3n)R=Es}!3+76>BDa(;l+B%3-K*$W$u9Y!w#tYbcUp)0
z;zrN;sJz%xHY0<J?Yop!{AAn6zRm{Zoy<uZS4ivRK*`eOI(IUVm#U}9N7s~WTzZ#L
zn3(jHF$y-?QYgu*Tn))aO68$4I#+D(z4PpsLgsa>ypm)kJ@%3=EDU9n_xb<54Vkkp
zLq4gvt;W(tWIIoU9da?5e)Q0$@&Ez*>KOl%q$m}wVd;YI8C0k2iNcE~;<r)hs#53$
zT`ABou0D_~D?-*8H`S*CMnM;q=IW%%GQH}iE9}g0h-RUS@SUsZf^-tC&2f9Iyv997
zQQ>(i(LlOi>C$l=wAjyMPa0iCZS)DZG)JpASg7X3Jr2p~pbVakiaPXF7M<6#)=%GI
zA8?VG8}gRG9NIcWCk|$#Q<>`V`pkKcuFt1-N15rcJi(*obsd_vKujkpjsl*p1ex3)
z1v!YZY_6{d9km-#FGaZZ8VA8NV$#Z!JLH3Qwkh{ZvO6}6gWNLQM0wM@5$~)<+DPlQ
z4wcxQ$!;igp4_a8kaQ7d=H6j#!D~|rwS)a`vgHYNJDYr=A~oeky>U6IUraVOW#eLV
z<I-Avqh5z$(xGF`;h(a*l+-_yje4_jd1}{IAtqh)Iv5PjH)Tf+v5n+zDt8_|9MXxr
z>ebNM!r}UQ#Yuc#L;s6P6_j*I4V!X%Z>QZlye+S`+t-awoi7$9P3-sDZfkdY(G0G5
z%VD?{k;f%Ui1Z+?mquxOMP>u#1I24c-CN1#!j3cSlTWs7hOK6crrhl5Ser<{?Nm-V
zgioV|?7zIx*=z0XOocy_z35a{bO%$F_ca8Oxyt0&ic$7Ra;GWB)Y)XJt{^k7!hmvF
zS$a@nu9TZ`Dmw(NTI_C9A^(|(M^HFYlM%ar;bHa?L*u+<-@D;cuaE3K>qgKpe=1Ur
z?Mdn&6|%zh<3xOAEgV4Lh7=S!QaYyM$SM{#LK;=sZ1AM(R2*PP5V4(CXeOOX#Vu!y
z8*w@i54Om}W}@M-445>lSV@Q>s(a8N9pmF>rXnVYxH~|8*zF}g8eR_ZL7H{23g{H1
z%bw{0e_-J}6^B)ZPiE*>#*AlqQqD5wjM)~xSgB3uP37a6PNyLZq2>4tEId5Z{SI+m
WV!w(=2ogon&xjQIgidLu(f<G<D?m{I

diff --git a/src/main.cpp b/src/main.cpp
index 1ca697b..2104e65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,23 +4,26 @@
 #include <Qt/qtextcodec.h>
 // Internacionalización con GNU Gettext.
 #include <libintl.h>
+#define TEXTDOMAIN "browser"
+#define LOCALEDIR "/opt/opengnsys/lib/locale"
+#define CHARSET "UTF-8"
 
 int main(int argc, char *argv[])
 {
     // Preparar internacionalización.
     setlocale (LC_ALL, "");
-    bindtextdomain ("browser", "/opt/opengnsys/lib/locale");
-    textdomain ("browser");
+    bindtextdomain (TEXTDOMAIN, LOCALEDIR);
+    textdomain (TEXTDOMAIN);
 
     if(argc<=1)
     {
         printf(gettext("Uso: %s -qws http://sitioweb.com/\n"),argv[0]);
         return -1;
     }
-    // Codificación UTF-8.
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
+    // Codificación de caracteres.
+    QTextCodec::setCodecForTr(QTextCodec::codecForName(CHARSET));
+    QTextCodec::setCodecForCStrings(QTextCodec::codecForName(CHARSET));
+    QTextCodec::setCodecForLocale(QTextCodec::codecForName(CHARSET));
  
     QApplication a(argc, argv);
     MainWindow w;