Commit Graph

13 Commits

Author SHA1 Message Date
Lirusaito
a9eb118897 Sync with upstream alchemy in removing the Lag Meter Floater
Useless floater, full of opensim drama we'll have no part in.
2015-11-16 23:40:43 -05:00
Inusaito Sayori
e73ebfdb76 Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2015-03-25 17:39:15 -04:00
Damian Zhaoying
b124ca5ad3 Update translations on spanish files. 2015-03-21 22:37:20 -03:00
Damian Zhaoying
e40cee8708 Update spanish translations files and fix some typos. 2015-03-17 02:35:48 -03:00
Damian Zhaoying
8dc3dcd2ac Added Spanish translations to new Quit button toolbar and Shared options 2014-10-23 21:36:21 -03:00
Damian Zhaoying
7dca333166 Update spanish translations. Add translations for news floaters, dinamyc toolbars, RLVa and autoreplace. 2014-04-28 15:51:48 -03:00
Damian Zhaoying
302d9e1e50 Update notifications.xml and other files and add new file floater_inv_panel.xml 2013-08-26 17:51:51 -03:00
Damian Zhaoying
a248d8c3c0 update and fix spanish translations
Conflicts:
	indra/newview/skins/default/xui/es/floater_customize.xml
2013-07-25 04:44:58 -04:00
Lirusaito
3739639295 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
	indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.

Compile fixies:
	indra/newview/llavataractions.cpp needed to include llnotifications.h
	indra/newview/llvoicechannel.cpp needed to include llnotifications.h
2013-06-23 22:36:04 -04:00
Damian Zhaoying
a673496ed3 Update Spanish Translation, All files translated and up to date 2012-08-02 09:08:57 -03:00
Damian Zhaoying
8baceee06c Add Spanish Translation 2012-07-13 06:23:37 -03:00
Siana Gearz
6a7c9250fd Branding pt1 2010-11-14 17:28:44 +01:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00