summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-16 08:32:26 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-16 08:32:26 -0400
commit4ac1b64665a49c7121411f3db27718f0c37eaf33 (patch)
tree85d7f3ccdacd6f322fb1fa213aa91c12b2d4abf4 /doc
parent972df2587863737eafde9caf6fce89f330358b5e (diff)
parent2f9edd050669210d651e66a86efb9746c3fa8a34 (diff)
merge
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt8
-rw-r--r--doc/translations.txt7
2 files changed, 13 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 55a3aaf1f4..ec24b7f2a6 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -176,6 +176,8 @@ Ardy Lay
VWR-24917
Argent Stonecutter
VWR-68
+ArminWeatherHax
+ STORM-1532
Armin Weatherwax
VWR-8436
ArminasX Saiman
@@ -476,6 +478,7 @@ Identity Euler
Ima Mechanique
OPEN-50
OPEN-61
+ OPEN-76
STORM-1175
Imnotgoing Sideways
Inma Rau
@@ -566,6 +569,11 @@ Jonathan Yap
STORM-1276
STORM-1462
STORM-1459
+ STORM-1297
+ STORM-1522
+ STORM-1567
+ STORM-1572
+ STORM-1574
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/doc/translations.txt b/doc/translations.txt
index c9cfc1cdeb..9b7f2d6292 100644
--- a/doc/translations.txt
+++ b/doc/translations.txt
@@ -1,7 +1,9 @@
-#List of translators who contribute to SL Viewer 2.0+ and SL web translation by language
+#List of translators who contribute to SL Viewer 2.0+ by language
Danish
Flemming Congrejo
+ German
+Torben Trautman
French
Valerie Linden
Polish
@@ -21,6 +23,7 @@ Lunita Savira
Minerva Memel
Polo Gufler
Xiki Luik
-Perez Linden
+Shinya Tandino
+Catwise Yoshikawa
Traditional Chinese
gefeit Dufaux