diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
commit | 4057afd29161ad9cb69674ee608e48bc9e46a559 (patch) | |
tree | 058c53cb19d9b3e85fb0f9b70623c563704cdf17 /indra/newview/skins/default/xui/de | |
parent | 0f1dea30f827f920d2323d9450826f1a4baaa10b (diff) | |
parent | 7c222dfd136a4bb97700b390f8adbef6fe67cf5d (diff) |
merge changes for storm-1268
Diffstat (limited to 'indra/newview/skins/default/xui/de')
-rw-r--r-- | indra/newview/skins/default/xui/de/menu_viewer.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/de/notifications.xml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index de4c269be6..e010844206 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -159,7 +159,6 @@ <menu_item_check label="Kamerabeschränkungen deaktivieren" name="Disable Camera Distance"/> <menu_item_check label="Foto (hohe Auflösung)" name="HighResSnapshot"/> <menu_item_check label="Fotos auf Festplatte leise speichern" name="QuietSnapshotsToDisk"/> - <menu_item_check label="Fotos auf Festplatte komprimieren" name="CompressSnapshotsToDisk"/> <menu label="Performance Tools" name="Performance Tools"> <menu_item_call label="Lag-Anzeige" name="Lag Meter"/> <menu_item_check label="Statistikleiste" name="Statistics Bar"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index abea3442fa..1971061096 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2432,7 +2432,7 @@ Versuchen Sie es in einigen Minuten erneut. </notification> <notification name="ObjectGiveItem"> Ein Objekt namens <nolink>[OBJECTFROMNAME]</nolink>, das [NAME_SLURL] gehört, hat Ihnen folgende/n/s [OBJECTTYPE] übergeben: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Behalten"/> <button name="Discard" text="Verwerfen"/> |