diff options
author | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
commit | 6599e10d00f3a47e90136f5f6cb4b2d1e02cb2e5 (patch) | |
tree | d48c683923ee978db4dbb0d66cc0d9f45233a68e /indra/newview/skins/default/xui/de | |
parent | c16e726d0e2a8c607ce441eb5bf2419b16b41cab (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
Merge with tip of viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/de')
-rwxr-xr-x | indra/newview/skins/default/xui/de/menu_viewer.xml | 4 | ||||
-rwxr-xr-x | indra/newview/skins/default/xui/de/notifications.xml | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 1924ff4ec3..956530c990 100755 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -15,7 +15,7 @@ <menu_item_check label="Fliegen" name="Fly"/> <menu_item_check label="Immer rennen" name="Always Run"/> <menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/> - <menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/> + <menu_item_call label="Gehen/Rennen/Fliegen..." name="WalkRunFly"/> </menu> <menu label="Status" name="Status"> <menu_item_check label="Abwesend" name="Away"/> @@ -64,7 +64,7 @@ <menu_item_call label="Foto" name="Take Snapshot"/> <menu_item_call label="Ortsprofil" name="Place Profile"/> <menu_item_call label="Landinformationen" name="About Land"/> - <menu_item_call label="Region/Grundbesitz" name="Region/Estate"/> + <menu_item_call label="Region/Grundbesitz" name="RegionEstate"/> <menu_item_call label="Mein Landbesitz..." name="My Land"/> <menu_item_call label="Dieses Land kaufen" name="Buy Land"/> <menu label="Anzeigen" name="LandShow"> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 0b1c18cd51..fa7db0a8a3 100755 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2802,9 +2802,6 @@ Versuchen Sie es in einigen Minuten erneut. <notification name="NoValidCircuit"> Kein gültiger Verbindungscode. </notification> - <notification name="NoValidTimestamp"> - Kein gültiger Zeitstempel. - </notification> <notification name="NoPendingConnection"> Verbindung kann nicht hergestellt werden. </notification> |