[vidalia-svn] r3602: Backport r3516 and r3517 so 0.1.x can also build with Qt 4.5 (in vidalia/branches/vidalia-0.1: . src/vidalia/i18n/es)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-06 16:17:27 -0500 (Fri, 06 Mar 2009)
New Revision: 3602

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/i18n/es/qt_es.po
Log:

Backport r3516 and r3517 so 0.1.x can also build with Qt 4.5.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3524-3526,3528,3530
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3524-3526,3528,3530

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-06 12:22:28 UTC (rev 3601)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-06 21:17:27 UTC (rev 3602)
@@ -1,6 +1,9 @@
 0.1.12  xx-xxx-2009
   o Fix a bug in the hidden service settings configuration class that
     could lead to compile errors in Visual Studio and on IRIX.
+  o Remove two duplicated strings in the Spanish translation of Qt's
+    internal strings (qt_es.po). The duplicated strings caused build
+    errors when building with Qt 4.5. (Ticket #469)
   o Add an application icon based on Tor's logo to the vidalia.desktop
     file.
 

Modified: vidalia/branches/vidalia-0.1/src/vidalia/i18n/es/qt_es.po
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/i18n/es/qt_es.po	2009-03-06 12:22:28 UTC (rev 3601)
+++ vidalia/branches/vidalia-0.1/src/vidalia/i18n/es/qt_es.po	2009-03-06 21:17:27 UTC (rev 3602)
@@ -152,10 +152,6 @@
 msgid "Size"
 msgstr "Tamaño"
 
-msgctxt "QDirModel"
-msgid "Kind"
-msgstr "Clase"
-
 #: qdirmodel.cpp:431
 msgctxt "QDirModel"
 msgid "Type"
@@ -421,10 +417,6 @@
 msgid "Kind"
 msgstr "Clase"
 
-msgctxt "QFileSystemModel"
-msgid "Type"
-msgstr "Tipo"
-
 #: qfilesystemmodel.cpp:849
 msgctxt "QFileSystemModel"
 msgid "Date Modified"