diff options
Diffstat (limited to 'indra')
340 files changed, 3953 insertions, 1918 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 0272c55db2..0ed700b9da 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -775,6 +775,33 @@ void LLMemoryInfo::stream(std::ostream& s) const #endif } +S32 LLDisplayInfo::getDisplayWidth() const +{ +#if LL_WINDOWS + return ::GetSystemMetrics(SM_CXVIRTUALSCREEN); +#elif LL_DARWIN + return 1024; //*FIXME +#elif LL_SOLARIS + return 1024; //*FIXME +#else + return 1024; //*FIXME +#endif +} + +S32 LLDisplayInfo::getDisplayHeight() const +{ +#if LL_WINDOWS + return ::GetSystemMetrics(SM_CYVIRTUALSCREEN); +#elif LL_DARWIN + return 768; //*FIXME +#elif LL_SOLARIS + return 768; //*FIXME +#else + return 768; //*FIXME +#endif +} + + std::ostream& operator<<(std::ostream& s, const LLOSInfo& info) { info.stream(s); diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index c2c45bec9a..aa3fdd485b 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -122,6 +122,21 @@ public: U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes }; +//============================================================================= +// +// CLASS LLDisplayInfo +class LL_COMMON_API LLDisplayInfo + +/*! @brief Class to query the information about some display settings +*/ +{ +public: + LLDisplayInfo(){}; ///< Default constructor + + S32 getDisplayWidth() const; ///< display width + S32 getDisplayHeight() const; ///< display height + +}; LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info); LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info); diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 853f6f173d..532b6b6524 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -209,6 +209,16 @@ set(llui_HEADER_FILES set_source_files_properties(${llui_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) +SET(llurlentry_TEST_DEPENDENCIES + llurlmatch.cpp + llurlregistry.cpp + ) + +set_source_files_properties(llurlentry.cpp + PROPERTIES LL_TEST_ADDITIONAL_SOURCE_FILES + "${llurlentry_TEST_DEPENDENCIES}" + ) + list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES}) add_library (llui ${llui_SOURCE_FILES}) diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 1dcfb4e296..30fc7babae 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -2061,12 +2061,5 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y) tuple->mButton->onCommit(); } } - /** - * EXT - 4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater) - * - * During hovering mouse(with left mouse button hold) over tabs, a newly just activated corresponding - * to the tab(that is hovered in the given instant of time) panel may caught mouse capture. - */ - gFocusMgr.setMouseCapture(this); } } diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 20c939874b..35428e4227 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -34,6 +34,8 @@ #include "linden_common.h" #include "llurlentry.h" #include "lluri.h" +#include "llurlmatch.h" +#include "llurlregistry.h" #include "llcachename.h" #include "lltrans.h" @@ -308,6 +310,7 @@ LLUrlEntryAgent::LLUrlEntryAgent() boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_agent.xml"; mIcon = "Generic_Person"; + mTooltip = LLTrans::getString("TooltipAgentUrl"); mColor = LLUIColorTable::instance().getColor("AgentLinkColor"); } @@ -602,6 +605,20 @@ std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const return getUrlFromWikiLink(string); } +std::string LLUrlEntrySLLabel::getTooltip(const std::string &string) const +{ + // return a tooltip corresponding to the URL type instead of the generic one (EXT-4574) + std::string url = getUrl(string); + LLUrlMatch match; + if (LLUrlRegistry::instance().findUrl(url, match)) + { + return match.getTooltip(); + } + + // unrecognized URL? should not happen + return LLUrlEntryBase::getTooltip(string); +} + // // LLUrlEntryWorldMap Describes secondlife:///<location> URLs // diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 3abada0f24..c947ef7259 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -83,7 +83,7 @@ public: LLUIColor getColor() const { return mColor; } /// Given a matched Url, return a tooltip string for the hyperlink - std::string getTooltip() const { return mTooltip; } + virtual std::string getTooltip(const std::string &string) const { return mTooltip; } /// Return the name of a XUI file containing the context menu items std::string getMenuName() const { return mMenuName; } @@ -257,6 +257,7 @@ public: LLUrlEntrySLLabel(); /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); /*virtual*/ std::string getUrl(const std::string &string) const; + /*virtual*/ std::string getTooltip(const std::string &string) const; }; /// diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 722dbe41b3..faa02e1904 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -174,7 +174,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match.setValues(match_start, match_end, match_entry->getUrl(url), match_entry->getLabel(url, cb), - match_entry->getTooltip(), + match_entry->getTooltip(url), match_entry->getIcon(), match_entry->getColor(), match_entry->getMenuName(), diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index c7aba04492..e66ac3049f 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -43,6 +43,13 @@ #include "llpluginmessageclasses.h" #include "media_plugin_base.h" +// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified +#if LL_LINUX +# define LL_QTWEBKIT_USES_PIXMAPS 1 +#else +# define LL_QTWEBKIT_USES_PIXMAPS 0 +#endif // LL_LINUX + #if LL_LINUX # include "linux_volume_catcher.h" #endif // LL_LINUX @@ -142,7 +149,11 @@ private: { const unsigned char* browser_pixels = LLQtWebKit::getInstance()->grabBrowserWindow( mBrowserWindowId ); - unsigned int buffer_size = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId ) * LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId ); + unsigned int rowspan = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId ); + unsigned int height = LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId ); +#if !LL_QTWEBKIT_USES_PIXMAPS + unsigned int buffer_size = rowspan * height; +#endif // !LL_QTWEBKIT_USES_PIXMAPS // std::cerr << "webkit plugin: updating" << std::endl; @@ -150,7 +161,16 @@ private: if ( mPixels && browser_pixels ) { // std::cerr << " memcopy of " << buffer_size << " bytes" << std::endl; + +#if LL_QTWEBKIT_USES_PIXMAPS + // copy the pixel data upside-down because of the co-ord system + for (int y=0; y<height; ++y) + { + memcpy( &mPixels[(height-y-1)*rowspan], &browser_pixels[y*rowspan], rowspan ); + } +#else memcpy( mPixels, browser_pixels, buffer_size ); +#endif // LL_QTWEBKIT_USES_PIXMAPS } if ( mWidth > 0 && mHeight > 0 ) @@ -258,8 +278,10 @@ private: // append details to agent string LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" ); +#if !LL_QTWEBKIT_USES_PIXMAPS // don't flip bitmap LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true ); +#endif // !LL_QTWEBKIT_USES_PIXMAPS // set background color // convert background color channels from [0.0, 1.0] to [0, 255]; @@ -677,7 +699,11 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) message.setValueS32("default_height", 1024); message.setValueS32("depth", mDepth); message.setValueU32("internalformat", GL_RGBA); +#if LL_QTWEBKIT_USES_PIXMAPS + message.setValueU32("format", GL_BGRA_EXT); // I hope this isn't system-dependant... is it? If so, we'll have to check the root window's pixel layout or something... yuck. +#else message.setValueU32("format", GL_RGBA); +#endif // LL_QTWEBKIT_USES_PIXMAPS message.setValueU32("type", GL_UNSIGNED_BYTE); message.setValueBoolean("coords_opengl", true); sendMessage(message); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f87cdbc43e..a64a1a395f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5492,7 +5492,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0</real> + <real>0.9</real> </map> <key>PlainTextChatHistory</key> diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico Binary files differindex 1e00530c90..efe6c4f323 100644 --- a/indra/newview/installers/windows/install_icon.ico +++ b/indra/newview/installers/windows/install_icon.ico diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico Binary files differindex c4ec6c70bd..05e1546860 100644 --- a/indra/newview/installers/windows/uninstall_icon.ico +++ b/indra/newview/installers/windows/uninstall_icon.ico diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 948d38befb..6d4c90c2b9 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -304,7 +304,8 @@ static std::string gLaunchFileOnQuit; // Used on Win32 for other apps to identify our window (eg, win_setup) const char* const VIEWER_WINDOW_CLASSNAME = "Second Life"; - +static const S32 FIRST_RUN_WINDOW_WIDTH = 1024; +static const S32 FIRST_RUN_WINDOW_HRIGHT = 768; //---------------------------------------------------------------------------- // List of entries from strings.xml to always replace @@ -2362,12 +2363,35 @@ bool LLAppViewer::initWindow() // store setting in a global for easy access and modification gNoRender = gSavedSettings.getBOOL("DisableRendering"); + S32 window_x = gSavedSettings.getS32("WindowX"); + S32 window_y = gSavedSettings.getS32("WindowY"); + S32 window_width = gSavedSettings.getS32("WindowWidth"); + S32 window_height = gSavedSettings.getS32("WindowHeight"); + + bool show_maximized = gSavedSettings.getBOOL("WindowMaximized"); + + bool first_run = gSavedSettings.getBOOL("FirstLoginThisInstall"); + + if (first_run)//for first login + { + window_width = FIRST_RUN_WINDOW_WIDTH;//yep hardcoded + window_height = FIRST_RUN_WINDOW_HRIGHT; + + //if screen resolution is lower then 1024*768 then show maximized + LLDisplayInfo display_info; + if(display_info.getDisplayWidth() <= FIRST_RUN_WINDOW_WIDTH + || display_info.getDisplayHeight()<=FIRST_RUN_WINDOW_HRIGHT) + { + show_maximized = true; + } + } + // always start windowed BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth"); gViewerWindow = new LLViewerWindow(gWindowTitle, VIEWER_WINDOW_CLASSNAME, - gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"), - gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"), + window_x, window_y, + window_width, window_height, FALSE, ignorePixelDepth); LLNotificationsUI::LLNotificationManager::getInstance(); @@ -2378,7 +2402,7 @@ bool LLAppViewer::initWindow() gViewerWindow->toggleFullscreen(FALSE); } - if (gSavedSettings.getBOOL("WindowMaximized")) + if (show_maximized) { gViewerWindow->mWindow->maximize(); gViewerWindow->getWindow()->setNativeAspectRatio(gSavedSettings.getF32("FullScreenAspectRatio")); diff --git a/indra/newview/llclassifiedstatsresponder.cpp b/indra/newview/llclassifiedstatsresponder.cpp index ecd1879090..95f17aa7ba 100644 --- a/indra/newview/llclassifiedstatsresponder.cpp +++ b/indra/newview/llclassifiedstatsresponder.cpp @@ -43,11 +43,12 @@ #include "llview.h" #include "message.h" -LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLHandle<LLView> classified_panel_handle, LLUUID classified_id) -: mClassifiedPanelHandle(classified_panel_handle), +LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLUUID classified_id) +: mClassifiedID(classified_id) { } + /*virtual*/ void LLClassifiedStatsResponder::result(const LLSD& content) { @@ -58,17 +59,12 @@ void LLClassifiedStatsResponder::result(const LLSD& content) S32 search_map = content["search_map_clicks"].asInteger(); S32 search_profile = content["search_profile_clicks"].asInteger(); - LLPanelClassified* classified_panelp = (LLPanelClassified*)mClassifiedPanelHandle.get(); - - if(classified_panelp) - { - classified_panelp->setClickThrough(mClassifiedID, - teleport + search_teleport, - map + search_map, - profile + search_profile, - true); - } - + LLPanelClassifiedInfo::setClickThrough( + mClassifiedID, + teleport + search_teleport, + map + search_map, + profile + search_profile, + true); } /*virtual*/ @@ -77,5 +73,3 @@ void LLClassifiedStatsResponder::error(U32 status, const std::string& reason) llinfos << "LLClassifiedStatsResponder::error(" << status << ": " << reason << ")" << llendl; } - - diff --git a/indra/newview/llclassifiedstatsresponder.h b/indra/newview/llclassifiedstatsresponder.h index 9c52ed5ae1..4a74f7b129 100644 --- a/indra/newview/llclassifiedstatsresponder.h +++ b/indra/newview/llclassifiedstatsresponder.h @@ -40,7 +40,7 @@ class LLClassifiedStatsResponder : public LLHTTPClient::Responder { public: - LLClassifiedStatsResponder(LLHandle<LLView> classified_panel_handle, LLUUID classified_id); + LLClassifiedStatsResponder(LLUUID classified_id); //If we get back a normal response, handle it here virtual void result(const LLSD& content); //If we get back an error (not found, etc...), handle it here @@ -48,7 +48,6 @@ public: virtual void error(U32 status, const std::string& reason); protected: - LLHandle<LLView> mClassifiedPanelHandle; LLUUID mClassifiedID; }; diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 780393a9c0..839d3f0c21 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -985,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting() if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|") { llwarns << "cleaning old BusyModeResponse" << llendl; - gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse")); + //LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885) + gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault")); } } @@ -1288,7 +1289,7 @@ BOOL LLPanelPreference::postBuild() if (hasChild("media_enabled")) { bool media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia"); - getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); + getChild<LLCheckBoxCtrl>("media_enabled")->set(media_enabled); getChild<LLCheckBoxCtrl>("autoplay_enabled")->setEnabled(media_enabled); } @@ -1296,7 +1297,11 @@ BOOL LLPanelPreference::postBuild() { getChild<LLCheckBoxCtrl>("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic")); } - + if (hasChild("voice_call_friends_only_check")) + { + getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); + } + apply(); return true; } diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index fdf128945e..122bdc8bc7 100644 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -557,7 +557,7 @@ void LLPanelScriptLimitsRegionMemory::setParcelID(const LLUUID& parcel_id) // virtual void LLPanelScriptLimitsRegionMemory::setErrorStatus(U32 status, const std::string& reason) { - llerrs << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl; + llwarns << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl; } // callback from the name cache with an owner name to add to the list diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index f3ac676edd..0e9da25c58 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -74,6 +74,11 @@ public: void setNameFilter(const std::string& filter); void toggleIcons(); bool getIconsVisible() const { return mShowIcons; } + + // *WORKAROUND: two methods to overload appropriate Params due to localization issue: + // no_groups_msg & no_filtered_groups_msg attributes are not defined as translatable in VLT. See EXT-5931 + void setNoGroupsMsg(const std::string& msg) { mNoGroupsMsg = msg; } + void setNoFilteredGroupsMsg(const std::string& msg) { mNoFilteredGroupsMsg = msg; } private: void setDirty(bool val = true) { mDirty = val; } diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 8cdc50eb70..77eaebb0bc 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -127,12 +127,6 @@ void LLIMFloater::onFocusReceived() { LLIMModel::getInstance()->setActiveSessionID(mSessionID); - // return focus to the input field when active tab in the multitab container is clicked. - if (isChatMultiTab() && mInputEditor) - { - mInputEditor->setFocus(TRUE); - } - LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true); } @@ -682,15 +676,6 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void* //in disconnected state IM input editor should be disabled self->mInputEditor->setEnabled(!gDisconnected); } - - // when IM Floater is a part of the multitab container LLTabContainer set focus to the first - // child on tab button's mouse up. This leads input field lost focus. See EXT-3852. - if (isChatMultiTab()) - { - // So, clear control captured mouse to prevent LLTabContainer set focus on the panel's first child. - // do not pass self->mInputEditor, this leads to have "Edit Text" mouse pointer wherever it is. - gFocusMgr.setMouseCapture(NULL); - } } // static diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1dc601e260..b3f085ef6d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1565,7 +1565,7 @@ void LLCallDialog::onOpen(const LLSD& key) LLDockableFloater::onOpen(key); // it should be over the all floaters. EXT-5116 - gFloaterView->bringToFront(this); + gFloaterView->bringToFront(this, FALSE); } void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 326f2a5577..83a466a243 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1542,7 +1542,7 @@ void LLInventoryModel::bulkFetch(std::string url) U32 folder_count=0; U32 max_batch_size=5; - U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1; LLSD body; LLSD body_lib; diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 37b03dbd7d..928a458b84 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -65,10 +65,6 @@ class LLInventoryPanel : public LLPanel // Data //-------------------------------------------------------------------- public: - static const std::string DEFAULT_SORT_ORDER; - static const std::string RECENTITEMS_SORT_ORDER; - static const std::string INHERIT_SORT_ORDER; - struct Filter : public LLInitParam::Block<Filter> { Optional<U32> sort_order; @@ -142,8 +138,6 @@ public: U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); } void setFilterSubString(const std::string& string); const std::string getFilterSubString() { return mFolders->getFilterSubString(); } - void setSortOrder(U32 order); - U32 getSortOrder() { return mFolders->getSortOrder(); } void setSinceLogoff(BOOL sl); void setHoursAgo(U32 hours); BOOL getSinceLogoff(); @@ -182,7 +176,6 @@ protected: LLInventoryModel* mInventory; LLInventoryObserver* mInventoryObserver; BOOL mAllowMultiSelect; - std::string mSortOrderSetting; LLFolderView* mFolders; LLScrollContainer* mScroller; @@ -196,6 +189,20 @@ protected: */ const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder; + + //-------------------------------------------------------------------- + // Sorting + //-------------------------------------------------------------------- +public: + static const std::string DEFAULT_SORT_ORDER; + static const std::string RECENTITEMS_SORT_ORDER; + static const std::string INHERIT_SORT_ORDER; + + void setSortOrder(U32 order); + U32 getSortOrder() const { return mFolders->getSortOrder(); } +private: + std::string mSortOrderSetting; + //-------------------------------------------------------------------- // Hidden folders //-------------------------------------------------------------------- diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h index 0d5c431d75..a163b6fd62 100644 --- a/indra/newview/llnotificationhandler.h +++ b/indra/newview/llnotificationhandler.h @@ -122,9 +122,17 @@ protected: class LLSysHandler : public LLEventHandler { public: + LLSysHandler(); virtual ~LLSysHandler() {}; virtual bool processNotification(const LLSD& notify)=0; + +protected : + static void init(); + void removeExclusiveNotifications(const LLNotificationPtr& notif); + + typedef std::list< std::set<std::string> > exclusive_notif_sets; + static exclusive_notif_sets sExclusiveNotificationGroups; }; /** @@ -171,6 +179,7 @@ public: protected: virtual void onDeleteToast(LLToast* toast); + virtual void onRejectToast(const LLUUID& id); virtual void initChannel(); }; diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index 9de9998cbd..88bb769109 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -43,6 +43,75 @@ using namespace LLNotificationsUI; +// static +std::list< std::set<std::string> > LLSysHandler::sExclusiveNotificationGroups; + +// static +void LLSysHandler::init() +{ + std::set<std::string> online_offline_group; + online_offline_group.insert("FriendOnline"); + online_offline_group.insert("FriendOffline"); + + sExclusiveNotificationGroups.push_back(online_offline_group); +} + +LLSysHandler::LLSysHandler() +{ + if(sExclusiveNotificationGroups.empty()) + { + init(); + } +} + +void LLSysHandler::removeExclusiveNotifications(const LLNotificationPtr& notif) +{ + LLScreenChannel* channel = dynamic_cast<LLScreenChannel *>(mChannel); + if (channel == NULL) + { + return; + } + + class ExclusiveMatcher: public LLScreenChannel::Matcher + { + public: + ExclusiveMatcher(const std::set<std::string>& excl_group, + const std::string& from_name) : + mExclGroup(excl_group), mFromName(from_name) + { + } + bool matches(const LLNotificationPtr notification) const + { + for (std::set<std::string>::const_iterator it = mExclGroup.begin(); it + != mExclGroup.end(); it++) + { + std::string from_name = LLHandlerUtil::getSubstitutionName(notification); + if (notification->getName() == *it && from_name == mFromName) + { + return true; + } + } + return false; + } + private: + const std::set<std::string>& mExclGroup; + const std::string& mFromName; + }; + + + for (exclusive_notif_sets::iterator it = sExclusiveNotificationGroups.begin(); it + != sExclusiveNotificationGroups.end(); it++) + { + std::set<std::string> group = *it; + std::set<std::string>::iterator g_it = group.find(notif->getName()); + if (g_it != group.end()) + { + channel->killMatchedToasts(ExclusiveMatcher(group, + LLHandlerUtil::getSubstitutionName(notif))); + } + } +} + const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), REVOKED_MODIFY_RIGHTS("RevokedModifyRights"), OBJECT_GIVE_ITEM( "ObjectGiveItem"), OBJECT_GIVE_ITEM_UNKNOWN_USER( @@ -249,9 +318,15 @@ LLUUID LLHandlerUtil::spawnIMSession(const std::string& name, const LLUUID& from // static std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notification) { - return notification->getSubstitutions().has("NAME") + std::string res = notification->getSubstitutions().has("NAME") ? notification->getSubstitutions()["NAME"] : notification->getSubstitutions()["[NAME]"]; + if (res.empty()) + { + LLUUID from_id = notification->getPayload()["FROM_ID"]; + gCacheName->getFullName(from_id, res); + } + return res; } // static diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index be76959d07..4e2c5085ed 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -40,6 +40,7 @@ #include "lltoastnotifypanel.h" #include "llviewercontrol.h" #include "llviewerwindow.h" +#include "llnotificationmanager.h" using namespace LLNotificationsUI; @@ -82,6 +83,10 @@ LLTipHandler::LLTipHandler(e_notification_type type, const LLSD& id) // Getting a Channel for our notifications mChannel = LLChannelManager::getInstance()->createNotificationChannel(); + + LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); + if(channel) + channel->setOnRejectToastCallback(boost::bind(&LLTipHandler::onRejectToast, this, _1)); } //-------------------------------------------------------------------------- @@ -167,6 +172,8 @@ bool LLTipHandler::processNotification(const LLSD& notify) p.is_tip = true; p.can_be_stored = false; + removeExclusiveNotifications(notification); + LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); if(channel) channel->addToast(p); @@ -185,4 +192,14 @@ void LLTipHandler::onDeleteToast(LLToast* toast) //-------------------------------------------------------------------------- +void LLTipHandler::onRejectToast(const LLUUID& id) +{ + LLNotificationPtr notification = LLNotifications::instance().find(id); + if (notification + && LLNotificationManager::getInstance()->getHandlerForNotification( + notification->getType()) == this) + { + LLNotifications::instance().cancel(notification); + } +} diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 7cf27d9141..d59a7d752e 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -41,6 +41,7 @@ #include "lldir.h" #include "lldispatcher.h" #include "llfloaterreg.h" +#include "llhttpclient.h" #include "llnotifications.h" #include "llnotificationsutil.h" #include "llparcel.h" @@ -83,6 +84,7 @@ const S32 DECLINE_TO_STATE = 0; //static std::list<LLPanelClassified*> LLPanelClassified::sAllPanels; +std::list<LLPanelClassifiedInfo*> LLPanelClassifiedInfo::sAllPanels; // "classifiedclickthrough" // strings[0] = classified_id @@ -103,10 +105,10 @@ public: S32 teleport_clicks = atoi(strings[1].c_str()); S32 map_clicks = atoi(strings[2].c_str()); S32 profile_clicks = atoi(strings[3].c_str()); - LLPanelClassified::setClickThrough(classified_id, teleport_clicks, - map_clicks, - profile_clicks, - false); + + LLPanelClassifiedInfo::setClickThrough( + classified_id, teleport_clicks, map_clicks, profile_clicks, false); + return true; } }; @@ -497,7 +499,7 @@ void LLPanelClassified::sendClassifiedInfoRequest() if (!url.empty()) { llinfos << "Classified stat request via capability" << llendl; - LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(((LLView*)this)->getHandle(), mClassifiedID)); + LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(mClassifiedID)); } } } @@ -1157,11 +1159,21 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo() , mScrollContainer(NULL) , mScrollingPanelMinHeight(0) , mScrollingPanelWidth(0) + , mSnapshotStreched(false) + , mTeleportClicksOld(0) + , mMapClicksOld(0) + , mProfileClicksOld(0) + , mTeleportClicksNew(0) + , mMapClicksNew(0) + , mProfileClicksNew(0) + , mSnapshotCtrl(NULL) { + sAllPanels.push_back(this); } LLPanelClassifiedInfo::~LLPanelClassifiedInfo() { + sAllPanels.remove(this); } // static @@ -1184,6 +1196,9 @@ BOOL LLPanelClassifiedInfo::postBuild() mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight(); mScrollingPanelWidth = mScrollingPanel->getRect().getWidth(); + mSnapshotCtrl = getChild<LLTextureCtrl>("classified_snapshot"); + mSnapshotRect = getDefaultSnapshotRect(); + return TRUE; } @@ -1215,6 +1230,9 @@ void LLPanelClassifiedInfo::reshape(S32 width, S32 height, BOOL called_from_pare { mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height); } + + mSnapshotRect = getDefaultSnapshotRect(); + stretchSnapshot(); } void LLPanelClassifiedInfo::onOpen(const LLSD& key) @@ -1234,6 +1252,7 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key) resetData(); resetControls(); + scrollToTop(); setClassifiedId(key["classified_id"]); setClassifiedName(key["name"]); @@ -1242,6 +1261,19 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key) LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this); LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId()); + gGenericDispatcher.addHandler("classifiedclickthrough", &sClassifiedClickThrough); + + // While we're at it let's get the stats from the new table if that + // capability exists. + std::string url = gAgent.getRegion()->getCapability("SearchStatRequest"); + if (!url.empty()) + { + llinfos << "Classified stat request via capability" << llendl; + LLSD body; + body["classified_id"] = getClassifiedId(); + LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(getClassifiedId())); + } + setInfoLoaded(false); } @@ -1263,6 +1295,7 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t static std::string mature_str = getString("type_mature"); static std::string pg_str = getString("type_pg"); static LLUIString price_str = getString("l$_price"); + static std::string date_fmt = getString("date_fmt"); bool mature = is_cf_mature(c_info->flags); childSetValue("content_type", mature ? mature_str : pg_str); @@ -1271,6 +1304,10 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing)); childSetValue("price_for_listing", LLSD(price_str)); + std::string date_str = date_fmt; + LLStringUtil::format(date_str, LLSD().with("datetime", (S32) c_info->creation_date)); + childSetText("creation_date", date_str); + setInfoLoaded(true); } } @@ -1286,6 +1323,7 @@ void LLPanelClassifiedInfo::resetData() mPosGlobal.clearVec(); childSetValue("category", LLStringUtil::null); childSetValue("content_type", LLStringUtil::null); + childSetText("click_through_text", LLStringUtil::null); } void LLPanelClassifiedInfo::resetControls() @@ -1295,6 +1333,7 @@ void LLPanelClassifiedInfo::resetControls() childSetEnabled("edit_btn", is_self); childSetVisible("edit_btn", is_self); childSetVisible("price_layout_panel", is_self); + childSetVisible("clickthrough_layout_panel", is_self); } void LLPanelClassifiedInfo::setClassifiedName(const std::string& name) @@ -1324,7 +1363,20 @@ void LLPanelClassifiedInfo::setClassifiedLocation(const std::string& location) void LLPanelClassifiedInfo::setSnapshotId(const LLUUID& id) { - childSetValue("classified_snapshot", id); + mSnapshotCtrl->setValue(id); + mSnapshotStreched = false; +} + +void LLPanelClassifiedInfo::draw() +{ + LLPanel::draw(); + + // Stretch in draw because it takes some time to load a texture, + // going to try to stretch snapshot until texture is loaded + if(!mSnapshotStreched) + { + stretchSnapshot(); + } } LLUUID LLPanelClassifiedInfo::getSnapshotId() @@ -1333,6 +1385,62 @@ LLUUID LLPanelClassifiedInfo::getSnapshotId() } // static +void LLPanelClassifiedInfo::setClickThrough( + const LLUUID& classified_id, + S32 teleport, + S32 map, + S32 profile, + bool from_new_table) +{ + llinfos << "Click-through data for classified " << classified_id << " arrived: [" + << teleport << ", " << map << ", " << profile << "] (" + << (from_new_table ? "new" : "old") << ")" << llendl; + + for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter) + { + LLPanelClassifiedInfo* self = *iter; + if (self->getClassifiedId() != classified_id) + { + continue; + } + + // *HACK: Skip LLPanelClassifiedEdit instances: they don't display clicks data. + // Those instances should not be in the list at all. + if (typeid(*self) != typeid(LLPanelClassifiedInfo)) + { + continue; + } + + llinfos << "Updating classified info panel" << llendl; + + // We need to check to see if the data came from the new stat_table + // or the old classified table. We also need to cache the data from + // the two separate sources so as to display the aggregate totals. + + if (from_new_table) + { + self->mTeleportClicksNew = teleport; + self->mMapClicksNew = map; + self->mProfileClicksNew = profile; + } + else + { + self->mTeleportClicksOld = teleport; + self->mMapClicksOld = map; + self->mProfileClicksOld = profile; + } + + static LLUIString ct_str = self->getString("click_through_text_fmt"); + + ct_str.setArg("[TELEPORT]", llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld)); + ct_str.setArg("[MAP]", llformat("%d", self->mMapClicksNew + self->mMapClicksOld)); + ct_str.setArg("[PROFILE]", llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld)); + + self->childSetText("click_through_text", ct_str.getString()); + } +} + +// static std::string LLPanelClassifiedInfo::createLocationText( const std::string& original_name, const std::string& sim_name, @@ -1363,6 +1471,60 @@ std::string LLPanelClassifiedInfo::createLocationText( return location_text; } +void LLPanelClassifiedInfo::stretchSnapshot() +{ + // *NOTE dzaporozhan + // Could be moved to LLTextureCtrl + + LLViewerFetchedTexture* texture = mSnapshotCtrl->getTexture(); + + if(!texture) + { + return; + } + + if(0 == texture->getOriginalWidth() || 0 == texture->getOriginalHeight()) + { + // looks like texture is not loaded yet + return; + } + + LLRect rc = mSnapshotRect; + // *HACK dzaporozhan + // LLTextureCtrl uses BTN_HEIGHT_SMALL as bottom for texture which causes + // drawn texture to be smaller than expected. (see LLTextureCtrl::draw()) + // Lets increase texture height to force texture look as expected. + rc.mBottom -= BTN_HEIGHT_SMALL; + + F32 t_width = texture->getFullWidth(); + F32 t_height = texture->getFullHeight(); + + F32 ratio = llmin<F32>( (rc.getWidth() / t_width), (rc.getHeight() / t_height) ); + + t_width *= ratio; + t_height *= ratio; + + rc.setCenterAndSize(rc.getCenterX(), rc.getCenterY(), llfloor(t_width), llfloor(t_height)); + mSnapshotCtrl->setShape(rc); + + mSnapshotStreched = true; +} + +LLRect LLPanelClassifiedInfo::getDefaultSnapshotRect() +{ + // Using scroll container makes getting default rect a hard task + // because rect in postBuild() and in first reshape() is not the same. + // Using snapshot_panel makes it easier to reshape snapshot. + return getChild<LLUICtrl>("snapshot_panel")->getLocalRect(); +} + +void LLPanelClassifiedInfo::scrollToTop() +{ + LLScrollContainer* scrollContainer = findChild<LLScrollContainer>("profile_scroll"); + if (scrollContainer) + scrollContainer->goToTop(); +} + void LLPanelClassifiedInfo::onMapClick() { LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal()); @@ -1381,6 +1543,7 @@ void LLPanelClassifiedInfo::onTeleportClick() void LLPanelClassifiedInfo::onExit() { LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this); + gGenericDispatcher.addHandler("classifiedclickthrough", NULL); // deregister our handler } ////////////////////////////////////////////////////////////////////////// @@ -1394,6 +1557,7 @@ LLPanelClassifiedEdit::LLPanelClassifiedEdit() : LLPanelClassifiedInfo() , mIsNew(false) , mCanClose(false) + , mPublishFloater(NULL) { } @@ -1445,6 +1609,8 @@ BOOL LLPanelClassifiedEdit::postBuild() childSetAction("save_changes_btn", boost::bind(&LLPanelClassifiedEdit::onSaveClick, this)); childSetAction("set_to_curr_location_btn", boost::bind(&LLPanelClassifiedEdit::onSetLocationClick, this)); + mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelClassifiedEdit::onTextureSelected, this)); + return TRUE; } @@ -1454,6 +1620,8 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key) mIsNew = classified_id.isNull(); + scrollToTop(); + if(mIsNew) { setAvatarId(gAgent.getID()); @@ -1499,6 +1667,9 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key) enableEditing(false); } + std::string save_btn_label = isNew() ? getString("publish_label") : getString("save_label"); + childSetLabelArg("save_changes_btn", "[LABEL]", save_btn_label); + resetDirty(); setInfoLoaded(false); } @@ -1567,12 +1738,12 @@ void LLPanelClassifiedEdit::resetDirty() getChild<LLUICtrl>("price_for_listing")->resetDirty(); } -void LLPanelClassifiedEdit::setSaveCallback(const commit_callback_t& cb) +void LLPanelClassifiedEdit::setSaveCallback(const commit_signal_t::slot_type& cb) { - getChild<LLButton>("save_changes_btn")->setClickedCallback(cb); + mSaveButtonClickedSignal.connect(cb); } -void LLPanelClassifiedEdit::setCancelCallback(const commit_callback_t& cb) +void LLPanelClassifiedEdit::setCancelCallback(const commit_signal_t::slot_type& cb) { getChild<LLButton>("cancel_btn")->setClickedCallback(cb); } @@ -1592,6 +1763,22 @@ bool LLPanelClassifiedEdit::canClose() return mCanClose; } +void LLPanelClassifiedEdit::draw() +{ + LLPanel::draw(); + + // Need to re-stretch on every draw because LLTextureCtrl::onSelectCallback + // does not trigger callbacks when user navigates through images. + stretchSnapshot(); +} + +void LLPanelClassifiedEdit::stretchSnapshot() +{ + LLPanelClassifiedInfo::stretchSnapshot(); + + getChild<LLUICtrl>("edit_icon")->setShape(mSnapshotCtrl->getRect()); +} + void LLPanelClassifiedEdit::sendUpdate() { LLAvatarClassifiedInfo c_data; @@ -1679,6 +1866,11 @@ S32 LLPanelClassifiedEdit::getPriceForListing() return childGetValue("price_for_listing").asInteger(); } +void LLPanelClassifiedEdit::setPriceForListing(S32 price) +{ + childSetValue("price_for_listing", price); +} + void LLPanelClassifiedEdit::onSetLocationClick() { setPosGlobal(gAgent.getPositionGlobal()); @@ -1722,9 +1914,45 @@ void LLPanelClassifiedEdit::onSaveClick() } } + if(isNew()) + { + mPublishFloater = LLFloaterReg::findTypedInstance<LLPublishClassifiedFloater>( + "publish_classified", LLSD()); + + if(!mPublishFloater) + { + mPublishFloater = LLFloaterReg::getTypedInstance<LLPublishClassifiedFloater>( + "publish_classified", LLSD()); + + mPublishFloater->setPublishClickedCallback(boost::bind + (&LLPanelClassifiedEdit::onPublishFloaterPublishClicked, this)); + } + + // set spinner value before it has focus or value wont be set + mPublishFloater->setPrice(getPriceForListing()); + mPublishFloater->openFloater(mPublishFloater->getKey()); + mPublishFloater->center(); + } + else + { + doSave(); + } +} + +void LLPanelClassifiedEdit::doSave() +{ mCanClose = true; sendUpdate(); resetDirty(); + + mSaveButtonClickedSignal(this, LLSD()); +} + +void LLPanelClassifiedEdit::onPublishFloaterPublishClicked() +{ + setPriceForListing(mPublishFloater->getPrice()); + + doSave(); } std::string LLPanelClassifiedEdit::getLocationNotice() @@ -1771,4 +1999,52 @@ void LLPanelClassifiedEdit::onTexturePickerMouseLeave(LLUICtrl* ctrl) ctrl->setVisible(FALSE); } +void LLPanelClassifiedEdit::onTextureSelected() +{ + setSnapshotId(mSnapshotCtrl->getValue().asUUID()); +} + +////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////// + +LLPublishClassifiedFloater::LLPublishClassifiedFloater(const LLSD& key) + : LLFloater(key) +{ +} + +LLPublishClassifiedFloater::~LLPublishClassifiedFloater() +{ +} + +BOOL LLPublishClassifiedFloater::postBuild() +{ + LLFloater::postBuild(); + + childSetAction("publish_btn", boost::bind(&LLFloater::closeFloater, this, false)); + childSetAction("cancel_btn", boost::bind(&LLFloater::closeFloater, this, false)); + + return TRUE; +} + +void LLPublishClassifiedFloater::setPrice(S32 price) +{ + childSetValue("price_for_listing", price); +} + +S32 LLPublishClassifiedFloater::getPrice() +{ + return childGetValue("price_for_listing").asInteger(); +} + +void LLPublishClassifiedFloater::setPublishClickedCallback(const commit_signal_t::slot_type& cb) +{ + getChild<LLButton>("publish_btn")->setClickedCallback(cb); +} + +void LLPublishClassifiedFloater::setCancelClickedCallback(const commit_signal_t::slot_type& cb) +{ + getChild<LLButton>("cancel_btn")->setClickedCallback(cb); +} + //EOF diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 9e33e55b88..78f095a9bb 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -202,6 +202,23 @@ private: void* mUserData; }; +class LLPublishClassifiedFloater : public LLFloater +{ +public: + LLPublishClassifiedFloater(const LLSD& key); + virtual ~LLPublishClassifiedFloater(); + + /*virtual*/ BOOL postBuild(); + + void setPrice(S32 price); + S32 getPrice(); + + void setPublishClickedCallback(const commit_signal_t::slot_type& cb); + void setCancelClickedCallback(const commit_signal_t::slot_type& cb); + +private: +}; + class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver { public: @@ -250,12 +267,21 @@ public: void setInfoLoaded(bool loaded) { mInfoLoaded = loaded; } + static void setClickThrough( + const LLUUID& classified_id, + S32 teleport, + S32 map, + S32 profile, + bool from_new_table); + void setExitCallback(const commit_callback_t& cb); void setEditClassifiedCallback(const commit_callback_t& cb); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + /*virtual*/ void draw(); + protected: LLPanelClassifiedInfo(); @@ -269,10 +295,20 @@ protected: const std::string& sim_name, const LLVector3d& pos_global); + void stretchSnapshot(); + + LLRect getDefaultSnapshotRect(); + + void scrollToTop(); + void onMapClick(); void onTeleportClick(); void onExit(); + bool mSnapshotStreched; + LLRect mSnapshotRect; + LLTextureCtrl* mSnapshotCtrl; + private: LLUUID mAvatarId; @@ -286,6 +322,17 @@ private: S32 mScrollingPanelMinHeight; S32 mScrollingPanelWidth; + + // Needed for stat tracking + S32 mTeleportClicksOld; + S32 mMapClicksOld; + S32 mProfileClicksOld; + S32 mTeleportClicksNew; + S32 mMapClicksNew; + S32 mProfileClicksNew; + + typedef std::list<LLPanelClassifiedInfo*> panel_list_t; + static panel_list_t sAllPanels; }; class LLPanelClassifiedEdit : public LLPanelClassifiedInfo @@ -306,9 +353,9 @@ public: /*virtual*/ void resetDirty(); - void setSaveCallback(const commit_callback_t& cb); + void setSaveCallback(const commit_signal_t::slot_type& cb); - void setCancelCallback(const commit_callback_t& cb); + void setCancelCallback(const commit_signal_t::slot_type& cb); /*virtual*/ void resetControls(); @@ -316,6 +363,10 @@ public: bool canClose(); + void draw(); + + void stretchSnapshot(); + protected: LLPanelClassifiedEdit(); @@ -332,6 +383,8 @@ protected: S32 getPriceForListing(); + void setPriceForListing(S32 price); + U8 getFlags(); std::string getLocationNotice(); @@ -344,12 +397,22 @@ protected: void onChange(); void onSaveClick(); + void doSave(); + + void onPublishFloaterPublishClicked(); + void onTexturePickerMouseEnter(LLUICtrl* ctrl); void onTexturePickerMouseLeave(LLUICtrl* ctrl); + void onTextureSelected(); + private: bool mIsNew; bool mCanClose; + + LLPublishClassifiedFloater* mPublishFloater; + + commit_signal_t mSaveButtonClickedSignal; }; #endif // LL_LLPANELCLASSIFIED_H diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 50cfc7d177..421c9df9a1 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -117,7 +117,7 @@ LLPanelMainInventory::LLPanelMainInventory() // Controls // *TODO: Just use persistant settings for each of these - U32 sort_order = gSavedSettings.getU32("InventorySortOrder"); + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER); BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE ); BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME ); BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP ); @@ -145,7 +145,7 @@ BOOL LLPanelMainInventory::postBuild() if (mActivePanel) { // "All Items" is the previous only view, so it gets the InventorySortOrder - mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder")); + mActivePanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER)); mActivePanel->getFilter()->markDefault(); mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState); mActivePanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mActivePanel, _1, _2)); diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 93a6a7803a..03e8ab644e 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -519,6 +519,8 @@ BOOL LLPanelPeople::postBuild() mRecentList->setShowIcons("RecentListShowIcons"); mGroupList = getChild<LLGroupList>("group_list"); + mGroupList->setNoGroupsMsg(getString("no_groups_msg")); + mGroupList->setNoFilteredGroupsMsg(getString("no_filtered_groups_msg")); mNearbyList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu); mRecentList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu); @@ -1440,8 +1442,6 @@ void LLPanelPeople::onFriendListRefreshComplete(LLUICtrl*ctrl, const LLSD& param { showAccordion("tab_all", param.asInteger()); } - updateButtons(); - } void LLPanelPeople::setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed) diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index c75d90be6f..a4426b370e 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -687,7 +687,10 @@ void LLNotificationsUI::LLScreenChannel::startFadingToasts() while (it != mToastList.end()) { ToastElem& elem = *it; - elem.toast->startFading(); + if (elem.toast->getVisible()) + { + elem.toast->startFading(); + } ++it; } } diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 8ca92c3d87..837f837430 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -183,6 +183,8 @@ public: void setShowLoadingPlaceholder(BOOL showLoadingPlaceholder); + LLViewerFetchedTexture* getTexture() { return mTexturep; } + private: BOOL allowDrop(LLInventoryItem* item); BOOL doDrop(LLInventoryItem* item); diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 8370c98470..65e9d8971a 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -117,6 +117,7 @@ #include "llmoveview.h" #include "llnearbychat.h" #include "llpanelblockedlist.h" +#include "llpanelclassified.h" #include "llpreviewanim.h" #include "llpreviewgesture.h" #include "llpreviewnotecard.h" @@ -219,6 +220,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("preview_sound", "floater_preview_sound.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewSound>, "preview"); LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview"); LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>); + LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>); LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>); LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml", diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index f02e854db6..80336e5c5a 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -48,6 +48,7 @@ #include "llsidetray.h" #include "llinventorybridge.h" +#include "llinventorypanel.h" #include "llfloaterinventory.h" #include "llviewerassettype.h" @@ -525,7 +526,7 @@ bool LLViewerInventoryCategory::fetchDescendents() // 2 = folders by date // Need to mask off anything but the first bit. // This comes from LLInventoryFilter from llfolderview.h - U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1; // *NOTE: For bug EXT-2879, originally commented out // gAgent.getRegion()->getCapability in order to use the old diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 344c4c469b..8acd343cf5 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -700,9 +700,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg) impl_list::iterator iter = sViewerMediaImplList.begin(); impl_list::iterator end = sViewerMediaImplList.end(); - for(; iter != end; iter++) + for(; iter != end;) { - LLViewerMediaImpl* pimpl = *iter; + LLViewerMediaImpl* pimpl = *iter++; pimpl->update(); pimpl->calculateInterest(); } @@ -1229,6 +1229,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string user_data_path = gDirUtilp->getOSUserAppDir(); user_data_path += gDirUtilp->getDirDelimiter(); + // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) + // If the linden username returned is blank, that can only mean we are + // at the login page displaying login Web page or Web browser test via Develop menu. + // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this + // is what we always used before this change) + std::string linden_user_dir = gDirUtilp->getLindenUserDir(); + if ( ! linden_user_dir.empty() ) + { + // gDirUtilp->getLindenUserDir() is whole path, not just Linden name + user_data_path = linden_user_dir; + user_data_path += gDirUtilp->getDirDelimiter(); + }; + // See if the plugin executable exists llstat s; if(LLFile::stat(launcher_name, &s)) diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index d6a9837b86..b2de31218b 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -235,8 +235,9 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type ) LLWearable *wearable = generateNewWearable(); wearable->setType( type ); - std::string name = "New "; - name.append( wearable->getTypeLabel() ); + LLSD item_name = LLSD().with("[WEARABLE_ITEM]", wearable->getTypeLabel()); + std::string name = LLTrans::getString("NewWearable"); + LLStringUtil::format(name, item_name); wearable->setName( name ); LLPermissions perm; diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico Binary files differindex c35a3fa3a3..87985b9285 100644 --- a/indra/newview/res/ll_icon.ico +++ b/indra/newview/res/ll_icon.ico diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns Binary files differindex ceb6036e0e..4560d4bb24 100644 --- a/indra/newview/secondlife.icns +++ b/indra/newview/secondlife.icns diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png Binary files differindex 605073d786..95913dd55b 100644 --- a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png +++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4768cf14fb..b1594816b2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -83,7 +83,7 @@ with the same filename but different name <texture name="BottomTray_Scroll_Left" file_name="navbar/Arrow_Left_Off.png" preload="false" /> <texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> - <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> + <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="Cam_Avatar_Disabled" file_name="bottomtray/Cam_Avatar_Disabled.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index eb63b5c975..91db3c6b1c 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -8,7 +8,7 @@ Bygget med [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i [REGION] lokaliseret på [HOSTNAME] ([HOSTIP]) + Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i regionen [REGION] lokaliseret ved <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> @@ -43,13 +43,9 @@ Vivox Version: [VIVOX_VERSION] </panel> <panel label="Tak til" name="credits_panel"> <text_editor name="credits_editor"> - Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others. + Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les og mange flere. -Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar - - - -I get by with a little help from my friends. --Richard Starkey +Tak til følgende beboere for at sikre at denne klient er den bedste version indtil nu: (under udarbejdelse) </text_editor> </panel> <panel label="Licenser" name="licenses_panel"> diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index b4af427538..9bda1397bc 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -81,6 +81,9 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel <text name="Group:"> Gruppe: </text> + <text name="GroupText"> + Leyla Linden + </text> <button label="Vælg..." label_selected="Vælg..." name="Set..."/> <check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen's jord tildeling."/> <button label="Dedikér..." label_selected="Dedikér..." name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/> @@ -124,6 +127,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel 0 </text> <button label="Køb land..." label_selected="Køb land..." name="Buy Land..."/> + <button label="Script Info" name="Scripts..."/> <button label="Køb til gruppe..." label_selected="Køb til gruppe..." name="Buy For Group..."/> <button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette område."/> <button label="Efterlad land..." label_selected="Efterlad land..." name="Abandon Land..."/> @@ -377,12 +381,9 @@ Kun større parceller kan vises i søgning. </text> <combo_box name="media type" tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie."/> <text left="4" name="at URL:"> - Medie URL: + Hjemmeside: </text> <button label="Vælg..." label_selected="Vælg..." name="set_media_url"/> - <text name="CurrentURL:"> - Nuværende side: - </text> <check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/> <text left="4" name="Description:"> Beskrivelse: @@ -393,8 +394,8 @@ Kun større parceller kan vises i søgning. </text> <texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/> <text name="replace_texture_help"> - (Objekter der har denne tekstur vil vise filmen eller -web-siden, efter du klikker på play knappen.) + Objekter der har denne tekstur vil vise filmen eller web-siden, efter du klikker på play knappen. Vælg + Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail for at vælge anden tekstur. </text> <check_box label="Auto skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/> <text name="media_size" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105"> @@ -411,8 +412,10 @@ web-siden, efter du klikker på play knappen.) <check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/> </panel> <panel label="LYD" name="land_audio_panel"> + <check_box label="Skjul URL" name="hide_music_url" tool_tip="Ved at vælge her, vil musik URL skjules for alle ikke autoriserede brugere der læser denne parcels information."/> <check_box label="Tillad stemmer" name="parcel_enable_voice_channel"/> <check_box label="Tillad stemmer (håndteret af estate)" name="parcel_enable_voice_channel_is_estate_disabled"/> + <check_box label="Begræns stemme chat til denne parcel" name="parcel_enable_voice_channel_local"/> </panel> <panel label="ADGANG" name="land_access_panel"> <panel.string name="access_estate_defined"> @@ -428,8 +431,8 @@ web-siden, efter du klikker på play knappen.) <text name="Only Allow"> Blokér adgang for:: </text> - <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/> - <check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/> + <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér for uidentificerede beboere."/> + <check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er alders-verificerede. Se [SUPPORT_SITE] for mere information."/> <check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck" tool_tip="Vælg gruppe under fanen 'generelt'."/> <check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Tillader midlertidig adgang til denne parcel"/> <combo_box name="pass_combo"> diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml index 47e02f0704..fdbfd737ba 100644 --- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml @@ -106,6 +106,9 @@ Maksimal animations længde er [MAX_LENGTH] sekunder. <floater.string name="E_ST_NO_XLT_EMOTE"> kan ikke læse "emote" navn. </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Incorrect root joint name, use "hip". + </floater.string> <text name="name_label"> Navn: </text> diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml index 1111c5e18b..e405a1beb8 100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml @@ -7,26 +7,37 @@ Blandede teksturer </text> <button label="Drop" label_selected="Dump" name="Dump"/> - <texture_picker label="Hår" name="hair_grain"/> - <texture_picker label="Alpha - hår" name="hair_alpha"/> - <texture_picker label="Makeup" name="head_bodypaint"/> - <texture_picker label="Alpha - hoved" name="head_alpha"/> - <texture_picker label="Tatovering hovede" name="head_tattoo"/> - <texture_picker label="Øje" name="eyes_iris"/> - <texture_picker label="Alpha - øjne" name="eyes_alpha"/> - <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/> - <texture_picker label="Undertrøje" name="upper_undershirt"/> - <texture_picker label="Handsker" name="upper_gloves"/> - <texture_picker label="Trøje" name="upper_shirt"/> - <texture_picker label="Øvre jakke" name="upper_jacket"/> - <texture_picker label="Alpha - øvre" name="upper_alpha"/> - <texture_picker label="Øvre tatovering" name="upper_tattoo"/> - <texture_picker label="Bodypaint - underkrop" name="lower_bodypaint"/> - <texture_picker label="Undertøj" name="lower_underpants"/> - <texture_picker label="Strømper" name="lower_socks"/> - <texture_picker label="Sko" name="lower_shoes"/> - <texture_picker label="Bukser" name="lower_pants"/> - <texture_picker label="Jakke" name="lower_jacket"/> - <texture_picker label="Alpha - nedre" name="lower_alpha"/> - <texture_picker label="Nedre tatovering" name="lower_tattoo"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <texture_picker label="Hår" name="hair-baked"/> + <texture_picker label="Hår" name="hair_grain"/> + <texture_picker label="Alpha - hår" name="hair_alpha"/> + <texture_picker label="Hoved" name="head-baked"/> + <texture_picker label="Makeup" name="head_bodypaint"/> + <texture_picker label="Alpha - hoved" name="head_alpha"/> + <texture_picker label="Tatovering - hoved" name="head_tattoo"/> + <texture_picker label="Eyes" name="eyes-baked"/> + <texture_picker label="Øje" name="eyes_iris"/> + <texture_picker label="Alpha - øjne" name="eyes_alpha"/> + <texture_picker label="Overkrop" name="upper-baked"/> + <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/> + <texture_picker label="Undertrøje" name="upper_undershirt"/> + <texture_picker label="Handsker" name="upper_gloves"/> + <texture_picker label="Trøje" name="upper_shirt"/> + <texture_picker label="Jakke - foroven" name="upper_jacket"/> + <texture_picker label="Alpha - øvre" name="upper_alpha"/> + <texture_picker label="Tatovering - øvre" name="upper_tattoo"/> + <texture_picker label="Ben" name="lower-baked"/> + <texture_picker label="Bodypaint - ben" name="lower_bodypaint"/> + <texture_picker label="Underbukser" name="lower_underpants"/> + <texture_picker label="Strømper" name="lower_socks"/> + <texture_picker label="Sko" name="lower_shoes"/> + <texture_picker label="Bukser" name="lower_pants"/> + <texture_picker label="Jakke" name="lower_jacket"/> + <texture_picker label="Alpha - nedre" name="lower_alpha"/> + <texture_picker label="Tatovering - nedre" name="lower_tattoo"/> + <texture_picker label="Nederdel" name="skirt-baked"/> + <texture_picker label="Nederdel" name="skirt"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml index d67d859e7b..8049b072ce 100644 --- a/indra/newview/skins/default/xui/da/floater_beacons.xml +++ b/indra/newview/skins/default/xui/da/floater_beacons.xml @@ -2,7 +2,7 @@ <floater name="beacons" title="PEJLELYS"> <panel name="beacons_panel"> <text name="label_show"> - Vis: + Vis : </text> <check_box label="Pejlelys" name="beacons"/> <check_box label="Fremhævninger" name="highlights"/> diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml index 0dd1a4f6ba..58a1c1b73e 100644 --- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml @@ -49,6 +49,6 @@ <check_box label="Redigere" name="next_owner_modify"/> <check_box label="Kopiére" name="next_owner_copy"/> <check_box initial_value="true" label="Overfør" name="next_owner_transfer" tool_tip="Næste ejer kan sælge eller forære dette objekt væk"/> - <button label="Ok" name="apply"/> + <button label="OK" name="apply"/> <button label="Annullér" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml index 18ee0e0597..49c2264956 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml @@ -46,7 +46,7 @@ L$ [AMT] </text> <text name="currency_links"> - [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] + [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] </text> <text name="exchange_rate_note"> Indtast beløbet for at se nyeste valutakurs. diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml index 987ad6585f..57bcc7ad9d 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml @@ -1,5 +1,134 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="KØB LAND"> + <floater.string name="can_resell"> + Kan videresælges. + </floater.string> + <floater.string name="can_not_resell"> + Kan ikke videresælges. + </floater.string> + <floater.string name="can_change"> + Kan samles eller opdeles. + </floater.string> + <floater.string name="can_not_change"> + Kan ikke samles eller opdeles. + </floater.string> + <floater.string name="cant_buy_for_group"> + Du har ikke tilladelse til at købe land for din aktive gruppe. + </floater.string> + <floater.string name="no_land_selected"> + Intet land er valgt. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Flere forskellige parceller er valgt. +Prøv at vælge et mindre område. + </floater.string> + <floater.string name="no_permission"> + Du har ikke tilladelse til at købe jord for din aktive gruppe. + </floater.string> + <floater.string name="parcel_not_for_sale"> + Det udvalgte parcel er ikke til salg. + </floater.string> + <floater.string name="group_already_owns"> + Gruppen ejer allerede parcellet. + </floater.string> + <floater.string name="you_already_own"> + Du ejer allerede parcellet. + </floater.string> + <floater.string name="set_to_sell_to_other"> + Det udvalgte parcel er sat til salg til en anden. + </floater.string> + <floater.string name="no_public_land"> + Det valgte område har ingen offentlige arealer. + </floater.string> + <floater.string name="not_owned_by_you"> + Jord, der ejes af en anden bruger er valgt. +Prøv at vælge et mindre område. + </floater.string> + <floater.string name="processing"> + Forarbejder dit køb... + +(Dette kan tage et minut eller to.) + </floater.string> + <floater.string name="fetching_error"> + Der er sket en fejl under hentning af jord købs oplysninger. + </floater.string> + <floater.string name="buying_will"> + Køb af dette areal vil: + </floater.string> + <floater.string name="buying_for_group"> + Køb af dette areal vil: + </floater.string> + <floater.string name="cannot_buy_now"> + Kan ikke købe nu: + </floater.string> + <floater.string name="not_for_sale"> + Ikke til salg: + </floater.string> + <floater.string name="none_needed"> + ikke nødvendigt + </floater.string> + <floater.string name="must_upgrade"> + Din konto skal være opgraderet for at eje jord. + </floater.string> + <floater.string name="cant_own_land"> + Din konto kan eje jord. + </floater.string> + <floater.string name="land_holdings"> + Du ejer [BUYER] m² land. + </floater.string> + <floater.string name="pay_to_for_land"> + Betal L$ [AMOUNT] til [SELLER] for dette stykke jord + </floater.string> + <floater.string name="buy_for_US"> + Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Denne parcel er på [AMOUNT] m² + </floater.string> + <floater.string name="premium_land"> + Dette stykke jord er premium, og vil tælle som [AMOUNT] m². + </floater.string> + <floater.string name="discounted_land"> + Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m². + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +kan indeholde [AMOUNT2] objekter + </floater.string> + <floater.string name="sold_with_objects"> + solgt med objekter + </floater.string> + <floater.string name="sold_without_objects"> + objekter ikke inkluderet + </floater.string> + <floater.string name="info_price_string"> + L$ [PRICE] +(L$ [PRICE_PER_SQM]/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Gruppen [GROUP] skal bruge nok tildelt jord brugs +kredit for at dække dette parcel før købet vil blive +gennemført. + </floater.string> + <floater.string name="have_enough_lindens"> + Du har L$ [AMOUNT], hvilket er nok til at købe denne jord. + </floater.string> + <floater.string name="not_enough_lindens"> + Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2]. + </floater.string> + <floater.string name="balance_left"> + Efter købet, vil du have L$ [AMOUNT] tilbage. + </floater.string> + <floater.string name="balance_needed"> + Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord. + </floater.string> + <floater.string name="no_parcel_selected"> + (intet parcel er valgt) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Region: </text> @@ -107,133 +236,4 @@ Denne parcel er på 512 m². <check_box label="Fjern [AMOUNT] m² af bidrag fra gruppe." name="remove_contribution"/> <button label="Køb" name="buy_btn"/> <button label="Annullér" name="cancel_btn"/> - <string name="can_resell"> - Kan videresælges. - </string> - <string name="can_not_resell"> - Kan ikke videresælges. - </string> - <string name="can_change"> - Kan samles eller opdeles. - </string> - <string name="can_not_change"> - Kan ikke samles eller opdeles. - </string> - <string name="cant_buy_for_group"> - Du har ikke tilladelse til at købe land for din aktive gruppe. - </string> - <string name="no_land_selected"> - Intet land er valgt. - </string> - <string name="multiple_parcels_selected"> - Flere forskellige parceller er valgt. -Prøv at vælge et mindre område. - </string> - <string name="no_permission"> - Du har ikke tilladelse til at købe jord for din aktive gruppe. - </string> - <string name="parcel_not_for_sale"> - Det udvalgte parcel er ikke til salg. - </string> - <string name="group_already_owns"> - Gruppen ejer allerede parcellet. - </string> - <string name="you_already_own"> - Du ejer allerede parcellet. - </string> - <string name="set_to_sell_to_other"> - Det udvalgte parcel er sat til salg til en anden. - </string> - <string name="no_public_land"> - Det valgte område har ingen offentlige arealer. - </string> - <string name="not_owned_by_you"> - Jord, der ejes af en anden bruger er valgt. -Prøv at vælge et mindre område. - </string> - <string name="processing"> - Forarbejder dit køb... - -(Dette kan tage et minut eller to.) - </string> - <string name="fetching_error"> - Der er sket en fejl under hentning af jord købs oplysninger. - </string> - <string name="buying_will"> - Køb af dette areal vil: - </string> - <string name="buying_for_group"> - Køb af dette areal vil: - </string> - <string name="cannot_buy_now"> - Kan ikke købe nu: - </string> - <string name="not_for_sale"> - Ikke til salg: - </string> - <string name="none_needed"> - ikke nødvendigt - </string> - <string name="must_upgrade"> - Din konto skal være opgraderet for at eje jord. - </string> - <string name="cant_own_land"> - Din konto kan eje jord. - </string> - <string name="land_holdings"> - Du ejer [BUYER] m² land. - </string> - <string name="pay_to_for_land"> - Betal L$ [AMOUNT] til [SELLER] for dette stykke jord - </string> - <string name="buy_for_US"> - Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Denne parcel er på [AMOUNT] m² - </string> - <string name="premium_land"> - Dette stykke jord er premium, og vil tælle som [AMOUNT] m². - </string> - <string name="discounted_land"> - Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -kan indeholde [AMOUNT2] objekter - </string> - <string name="sold_with_objects"> - solgt med objekter - </string> - <string name="sold_without_objects"> - objekter ikke inkluderet - </string> - <string name="info_price_string"> - L$ [PRICE] -(L$ [PRICE_PER_SQM]/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Gruppen [GROUP] skal bruge nok tildelt jord brugs -kredit for at dække dette parcel før købet vil blive -gennemført. - </string> - <string name="have_enough_lindens"> - Du har L$ [AMOUNT], hvilket er nok til at købe denne jord. - </string> - <string name="not_enough_lindens"> - Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2]. - </string> - <string name="balance_left"> - Efter købet, vil du have L$ [AMOUNT] tilbage. - </string> - <string name="balance_needed"> - Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord. - </string> - <string name="no_parcel_selected"> - (intet parcel er valgt) - </string> - <string name="buy_currency"> - Køb L$ [LINDENS] for omkring US$ [USD] - </string> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml index 514b2c4331..f744b06277 100644 --- a/indra/newview/skins/default/xui/da/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml @@ -21,7 +21,7 @@ <check_box label="Benyt nu" name="apply_immediate"/> <button label="" label_selected="" name="color_pipette"/> <button label="Annullér" label_selected="Annullér" name="cancel_btn"/> - <button label="Ok" label_selected="Ok" name="select_btn"/> + <button label="OK" label_selected="OK" name="select_btn"/> <text name="Current color:"> Nuværende Farve: </text> diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml index 379302ef6a..b8b4b03277 100644 --- a/indra/newview/skins/default/xui/da/floater_customize.xml +++ b/indra/newview/skins/default/xui/da/floater_customize.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater customize" title="UDSEENDE" width="509"> <tab_container name="customize tab container" width="507"> - <placeholder label="Krops Dele" name="body_parts_placeholder"/> + <text label="Krops Dele" name="body_parts_placeholder"> + Kropsdele + </text> <panel label="Kropsbygning" name="Shape"> <button label="Annullér" label_selected="Annullér" name="Revert"/> <button label="Krop" label_selected="Krop" name="Body"/> @@ -14,8 +16,8 @@ <button label="Overkrop" label_selected="Overkrop" name="Torso"/> <button label="Ben" label_selected="Ben" name="Legs"/> <radio_group name="sex radio"> - <radio_item label="Kvinde" name="radio"/> - <radio_item label="Mand" name="radio2"/> + <radio_item label="Kvinde" name="radio" value="0"/> + <radio_item label="Mand" name="radio2" value="1"/> </radio_group> <text name="title"> [DESC] @@ -33,9 +35,7 @@ Fundet i [PATH] </text> <text name="not worn instructions"> - Vælg en ny krop ved at trække en sådan fra din beholdning -over på din avatar. Du kan også oprette en fra bunden -og bagefter 'tage den på'. + Vælg en ny kropsbygning ved at trække en sådan fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -68,9 +68,7 @@ og bagefter 'tage den på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny hud på ved at trække en sådan fra din beholdning -over på din avatar. Du kan også oprette en hud fra bunden -og bagefter 'tage den på'. + Vælg en ny hud ved at trække en sådan fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -107,9 +105,7 @@ og bagefter 'tage den på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny hår på ved at trække et fra din beholdning -over på din avatar. Du kan også oprette et nyt hår fra bunden -og bagefter 'tage det på'. + Vælg et nyt hår ved at trække et sådant fra din beholdning over på din avatar. Du kan også oprette et fra bunden og bagefter 'tage det på'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -140,9 +136,7 @@ og bagefter 'tage det på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny sæt øjne på ved at trække et sæt fra din beholdning -over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden -og bagefter 'tage dem på'. + Vælg et nyt sæt øjne ved at trække et sådant par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -156,12 +150,14 @@ og bagefter 'tage dem på'. <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> </panel> - <placeholder label="Tøje" name="clothes_placeholder"/> + <text label="Tøje" name="clothes_placeholder"> + Tøj + </text> <panel label="Trøje" name="Shirt"> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> + <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> @@ -181,8 +177,7 @@ og bagefter 'tage dem på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny Tøje på ved at trække en fra din beholdning over på din avatar. -Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på'. + Vælg en ny trøje ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -194,8 +189,8 @@ Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på' <panel label="Bukser" name="Pants"> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> + <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> @@ -215,9 +210,7 @@ Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på' Fundet i [PATH] </text> <text name="not worn instructions"> - Tag nyr bukser på ved at trække dem fra din beholdning over på -din avatar. Du kan også oprette ny bukser fra bunden og bagefter -'tage dem på'. + Vælg et nyt par bukser ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -243,10 +236,9 @@ din avatar. Du kan også oprette ny bukser fra bunden og bagefter Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny par sko på ved at trække dem fra din beholdning -over på din avatar. Du kan også oprette et nyt par sko fra bunden -og bagefter 'tage dem på'. + Vælg et nyt par sko ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'. </text> + <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -255,7 +247,6 @@ og bagefter 'tage dem på'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -278,10 +269,9 @@ og bagefter 'tage dem på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny par Strømper på ved at trække dem fra din beholdning -over på din avatar. Du kan også oprette et nyt par Strømper fra bunden -og bagefter 'tage dem på'. + Vælg et nyt par sokker ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'. </text> + <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -290,7 +280,6 @@ og bagefter 'tage dem på'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -313,9 +302,9 @@ og bagefter 'tage dem på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny jakke på ved at trække en fra din beholdning over på din avatar. -Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på'. + Vælg en ny jakke ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> + <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -325,7 +314,6 @@ Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på' <texture_picker label="Stof øverst" name="Upper Fabric" tool_tip="Klik for at vælge et billede"/> <texture_picker label="Stof nederst" name="Lower Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -348,10 +336,9 @@ Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på' Fundet i [PATH] </text> <text name="not worn instructions"> - Tag nye handsker på ved at trække et par fra din beholdning over på -din avatar. Du kan også oprette nye handsker fra bunden -og bagefter 'tage dem på'. + Vælg et sæt nye handsker ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'. </text> + <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -360,7 +347,6 @@ og bagefter 'tage dem på'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -383,10 +369,9 @@ og bagefter 'tage dem på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny undertrøje på ved at trække en fra din beholdning over på -din avatar. Du kan også oprette en ny undertrøje fra bunden -og bagefter 'tage den på'. + Vælg en ny undertrøje ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> + <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -395,7 +380,6 @@ og bagefter 'tage den på'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -418,10 +402,9 @@ og bagefter 'tage den på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag nye underbukser på ved at trække dem fra din beholdning over på -din avatar. Du kan også oprette en par nye underbukser fra bunden -og bagefter 'tage dem på'. + Vælg et nyt par underbukser ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'. </text> + <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -430,7 +413,6 @@ og bagefter 'tage dem på'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -453,10 +435,9 @@ og bagefter 'tage dem på'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny nederdel på ved at trække en fra din beholdning over på -din avatar. Du kan også oprette en ny nederdel fra bunden -og bagefter 'tage den på'. + Vælg en ny nederdel ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> + <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -465,13 +446,12 @@ og bagefter 'tage den på'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> - <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> </panel> - <panel label="Alpha" name="Alpha"> + <panel label="Tatovering" name="Tattoo"> <text name="title"> [DESC] </text> @@ -488,27 +468,24 @@ og bagefter 'tage den på'. Placeret i [PATH] </text> <text name="not worn instructions"> - Brug en ny "alpha mask" ved at trække en fra din beholding til din avatar. -Alternativt kan du lave en fra bunden og bære denne. + Vælg en ny tatovering ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> + <button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at ændre denne. </text> <text name="Item Action Label"> - Alpha: + Tatovering: </text> - <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> - <button label="Lav ny "Alpha"" label_selected="Lav ny "Alpha"" name="Create New"/> + <texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Vend tilbage" label_selected="Vend tilbage" name="Revert"/> </panel> - <panel label="Tatovering" name="Tattoo"> + <panel label="Alpha" name="Alpha"> <text name="title"> [DESC] </text> @@ -525,19 +502,20 @@ Alternativt kan du lave en fra bunden og bære denne. Placeret i [PATH] </text> <text name="not worn instructions"> - Brug en ny tatovering ved at trække en fra din beholding til din avatar. -Alternativt kan du lave en fra bunden og bære denne. + Vælg en ny 'alpha maske' ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'. </text> + <button label="Lav ny "Alpha"" label_selected="Lav ny "Alpha"" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at ændre denne. </text> <text name="Item Action Label"> - Tatovering: + Alpha: </text> - <texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/> - <button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/> + <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -545,6 +523,7 @@ Alternativt kan du lave en fra bunden og bære denne. </panel> </tab_container> <scroll_container left="212" name="panel_container"/> + <button label="Script info" label_selected="Script info" name="script_info" tool_tip="Vis scripts vedhæftet på din avatar"/> <button label="Lav sæt" label_selected="Lav sæt" name="make_outfit_btn"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml new file mode 100644 index 0000000000..267a36b26c --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Event" name="Event" title="EVENT DETALJER"> + <floater.string name="none"> + ingen + </floater.string> + <floater.string name="notify"> + Meddel + </floater.string> + <floater.string name="dont_notify"> + Meddel ikke + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Event uden navn. + </text> + <text name="event_category"> + (ingen kategori) + </text> + <text name="event_runby_label"> + Afholdt af: + </text> + <text initial_value="(henter)" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 time + </text> + <text name="event_cover"> + Gratis + </text> + <text name="event_location_label"> + Lokation: + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Rating:"/> + <text name="rating_value" value="ukendt"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Opret event"/> + <button name="god_delete_event_btn" tool_tip="Slet event"/> + <button label="Giv besked" name="notify_btn"/> + <button label="Teleport" name="teleport_btn"/> + <button label="Kort" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml new file mode 100644 index 0000000000..ea045538c5 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="godtools floater" title="GOD TOOLS"> + <tab_container name="GodTools Tabs"> + <panel label="Region" name="region"> + <check_box label="Reset Home On Teleport" name="check reset home" tool_tip="Når beboere teleporterer væk, så sæt deres hjemmeadresse til deres destinations position."/> + </panel> + </tab_container> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml index fc52796344..4eba4aee1f 100644 --- a/indra/newview/skins/default/xui/da/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_help_browser" title="HJÆLP"> + <floater.string name="loading_text"> + Henter... + </floater.string> <layout_stack name="stack1"> - <layout_panel name="external_controls"> - <button label="Åben i min web browser" name="open_browser"/> - </layout_panel> + <layout_panel name="external_controls"/> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_im.xml b/indra/newview/skins/default/xui/da/floater_im.xml index 519a70d1d9..2ef8a7ce36 100644 --- a/indra/newview/skins/default/xui/da/floater_im.xml +++ b/indra/newview/skins/default/xui/da/floater_im.xml @@ -10,7 +10,7 @@ Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat. </string> <string name="muted_message"> - Du har blokeret denne beboer. Hvis du sender besked vil denne blokering fjernes. + Du har blokeret denne beboer. Hvis du sender en besked til beboeren vil dette automatisk medføre fjernelse af blokeringen </string> <string name="generic_request_error"> Kunne ikke etablere forbindelse, prøv igen senere diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml index da6f877f56..28b2f7f7eb 100644 --- a/indra/newview/skins/default/xui/da/floater_im_container.xml +++ b/indra/newview/skins/default/xui/da/floater_im_container.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="Personlige beskeder"/> +<multi_floater name="floater_im_box" title="SAMTALER"/> diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml index 3a1ef2e47d..2349174db2 100644 --- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="incoming call" title="UKENDT PERSON KALDER OP"> + <floater.string name="lifetime"> + 5 + </floater.string> <floater.string name="localchat"> Stemme chat nærved </floater.string> @@ -12,6 +15,9 @@ <floater.string name="VoiceInviteAdHoc"> har sluttet sig til stemme chat opkald med en konference chat. </floater.string> + <floater.string name="VoiceInviteGroup"> + deltager nu i Stemme chat opkald med denne gruppe [GROUP]. + </floater.string> <text name="question"> Ønsker du at forlade [CURRENT_CHAT] og slutte dig til denne stemme chat? </text> diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml index d80051fb84..3a4b0fbd6b 100644 --- a/indra/newview/skins/default/xui/da/floater_inventory.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="BEHOLDNING"> +<floater name="Inventory" title="MIN BEHOLDNING"> <floater.string name="Title"> - Beholdning + MIN BEHOLDNING </floater.string> <floater.string name="TitleFetching"> - Beholdning (henter [ITEM_COUNT] genstande...) [FILTER] + MIN BEHOLDNING (Henter [ITEM_COUNT] genstande...) [FILTER] </floater.string> <floater.string name="TitleCompleted"> - Beholdning ([ITEM_COUNT] genstande) [FILTER] + MIN BEHOLDNING ([ITEM_COUNT] genstande) [FILTER] </floater.string> <floater.string name="Fetched"> Hentet diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml index 4079ff9f38..0cc13fd736 100644 --- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml @@ -7,7 +7,7 @@ Kører </floater.string> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <button label="Nulstil" label_selected="Reset" name="Reset"/> <check_box initial_value="true" label="Kører" name="running"/> diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml index 2b008f133c..2594d6bb9d 100644 --- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="script ed float" title="LSL WIKI"> +<floater name="script ed float" title="LSL REFERENCE"> <check_box label="Følg markøreren" name="lock_check"/> <combo_box label="Lås" left_delta="114" name="history_combo" width="70"/> <button label="Tilbage" name="back_btn"/> diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index f618548908..82897d545a 100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="Mini-kort"> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml index 47667973ba..d3028c32f9 100644 --- a/indra/newview/skins/default/xui/da/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="MEDIE VÆLGER"> <layout_stack name="stack1"> <layout_panel name="nav_controls"> - <button label="Tilbage" name="back" /> - <button label="Frem" name="forward" /> - <button label="Opdater" name="reload" /> - <button label="Gå til" name="go" /> + <button label="Tilbage" name="back"/> + <button label="Frem" name="forward"/> + <button label="Opdater" name="reload"/> + <button label="Gå til" name="go"/> </layout_panel> <layout_panel name="parcel_owner_controls"> - <button label="Send nuværende URL til parcel" name="assign" /> + <button label="Send denne side til parcel" name="assign"/> </layout_panel> <layout_panel name="external_controls"> - <button label="Åben i min browser" name="open_browser" /> - <check_box label="Åben altid i min browser" name="open_always" /> - <button label="Luk" name="close" /> + <button label="Åben i min browser" name="open_browser"/> + <check_box label="Åben altid i min browser" name="open_always"/> + <button label="Luk" name="close"/> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index b00dc6bf4d..258af489e7 100644 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml @@ -19,11 +19,10 @@ Flyv baglæns (Tryk på Ned piletast eller S) </string> <panel name="panel_actions"> - <button label="" label_selected="" name="turn left btn" tool_tip="xxx - Drej til venstre (Tryk på venstre piletast eller A)"/> + <button label="" label_selected="" name="turn left btn" tool_tip="xxx Drej til venstre (Tryk på venstre piletast eller A)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/> - <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, Tryk på "E""/> - <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, Tryk på "C""/> + <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/> + <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/> <joystick_turn name="forward btn" tool_tip="Gå frem (Tryk på Op piletast eller W)"/> <joystick_turn name="backward btn" tool_tip="Gå tilbage (Tryk på Ned piletast eller S)"/> </panel> diff --git a/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml new file mode 100644 index 0000000000..0bcb96b151 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="modal container" title="Gem sæt"> + <button label="Gem" label_selected="Gem" name="Save"/> + <button label="Annullér" label_selected="Annullér" name="Cancel"/> + <text name="Save item as:"> + Gem hvad jeg har på som et nyt sæt: + </text> + <line_editor name="name ed"> + [DESC] (ny) + </line_editor> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml index 5c98d9855f..ef4e22dd8f 100644 --- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="outgoing call" title="KALDER"> + <floater.string name="lifetime"> + 5 + </floater.string> <floater.string name="localchat"> Stemme chat nærved </floater.string> @@ -21,6 +24,15 @@ <text name="noanswer"> Intet svar. Prøv igen senere. </text> + <text name="nearby"> + Du er blevet koblet af fra [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] har afsluttet opkaldet. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Du har afsluttet opkaldet. [RECONNECT_NEARBY] + </text> <text name="leaving"> Forlader [CURRENT_CHAT]. </text> diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml index f74e097da2..368d678681 100644 --- a/indra/newview/skins/default/xui/da/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml @@ -15,7 +15,7 @@ </text> <icon name="icon_object" tool_tip="Objekter"/> <text name="object_name_text"> - ... + Mit fantastiske objekt med et virkeligt langt navn </text> <button label="L$1" label_selected="L$1" name="fastpay 1"/> <button label="L$5" label_selected="L$5" name="fastpay 5"/> diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml index f0fe3472d0..a53586eaaf 100644 --- a/indra/newview/skins/default/xui/da/floater_preferences.xml +++ b/indra/newview/skins/default/xui/da/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="Generelt" name="general"/> <panel label="Grafik" name="display"/> <panel label="Privatliv" name="im"/> - <panel label="Sound" name="audio"/> + <panel label="Lyd & medier" name="audio"/> <panel label="Chat" name="chat"/> <panel label="Beskeder" name="msgs"/> <panel label="Opsætning" name="input"/> diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml index bfa3c150a9..f49fd8c99a 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml @@ -24,6 +24,9 @@ <floater.string name="Title"> Bevægelse: [NAME] </floater.string> + <text name="name_text"> + Navn: + </text> <text name="desc_label"> Beskrivelse: </text> diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml index 2ebec4462f..e600a774ec 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview notecard" title="NOTE:"> <floater.string name="no_object"> - Kunne ikke finde objekt der indeholder denne note. + Kunne ikke finde objekt som indeholder denne note. </floater.string> <floater.string name="not_allowed"> Du har ikke rettigheder til at se denne note. diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml index ab7ddbcc72..48cf53f563 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml @@ -12,6 +12,9 @@ <text name="dimensions"> [WIDTH]px x [HEIGHT]px </text> + <text name="aspect_ratio"> + Vis aspekt forhold + </text> <combo_box name="combo_aspect_ratio" tool_tip="Forhåndsvisning med et bestemt billedformat"> <combo_item name="Unconstrained"> Ikke låst @@ -38,7 +41,7 @@ 2:1 </combo_item> </combo_box> - <button label="OK" name="keep"/> - <button label="Annullér" name="discard"/> + <button label="OK" name="Keep"/> + <button label="Kassér" name="Discard"/> <button label="Gem som" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml index 9ef17a3cbb..07978792b9 100644 --- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml @@ -42,7 +42,7 @@ <combo_box.item label="Vælg kategori" name="Select_category"/> <combo_box.item label="Alder > Falsk alder" name="Age__Age_play"/> <combo_box.item label="Alder > Voksen beboer på Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/> - <combo_box.item label="Alder > Mindreårig beboer udenfor Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> + <combo_box.item label="Alder > Mindreårig beboer uden for Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> <combo_box.item label="Overfald > Kamp sandkasse / Usikkert område" name="Assault__Combat_sandbox___unsafe_area"/> <combo_box.item label="Overfald > Sikkert område" name="Assault__Safe_area"/> <combo_box.item label="Overfald > Sandkasse til våbentest" name="Assault__Weapons_testing_sandbox"/> diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml new file mode 100644 index 0000000000..a7f86a782a --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="scriptlimits" title="SCRIPT INFORMATION"/> diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml index 1e8d869716..1aacab6915 100644 --- a/indra/newview/skins/default/xui/da/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview lsl text" title="SCRIPT: ROTATIONS SCRIPT"> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <text name="desc txt"> Beskrivelse: diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml index fe0d31c6c3..9f7aad5e03 100644 --- a/indra/newview/skins/default/xui/da/floater_select_key.xml +++ b/indra/newview/skins/default/xui/da/floater_select_key.xml @@ -2,6 +2,6 @@ <floater name="modal container" title=""> <button label="Annullér" label_selected="Annullér" name="Cancel"/> <text name="Save item as:"> - Tryk på en taste for at sætte din "Tale" knap udløser. + Tryk en taste for at angive trigger til at tale. </text> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml index 41cf100d94..016e5af378 100644 --- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings_debug" title="DEBUG INDSTILLINGER"> - <combo_box name="boolean_combo"> - <combo_box.item label="SANDT" name="TRUE"/> - <combo_box.item label="FALSK" name="FALSE"/> - </combo_box> + <radio_group name="boolean_combo"> + <radio_item label="SANDT" name="TRUE" value="sand"/> + <radio_item label="FALSK" name="FALSE" value=""/> + </radio_group> <color_swatch label="Farve" name="val_color_swatch"/> <spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_2"/> diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml index 5e8c64e21f..6140055d74 100644 --- a/indra/newview/skins/default/xui/da/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml @@ -4,12 +4,12 @@ Hvor skal foto hen? </text> <radio_group label="Snapshot type" name="snapshot_type_radio"> - <radio_item label="Send via e-mail" name="postcard"/> - <radio_item label="Gem i din beholdning (L$[AMOUNT])" name="texture"/> - <radio_item label="Gem på din computer" name="local"/> + <radio_item label="Email" name="postcard"/> + <radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/> + <radio_item label="Gem på min computer" name="local"/> </radio_group> <text name="file_size_label"> - Fil størrelse: [SIZE] KB + [SIZE] KB </text> <button label="Tag nyt foto" name="new_snapshot_btn"/> <button label="Send" name="send_btn"/> @@ -19,8 +19,8 @@ <flyout_button_item label="Gem som..." name="saveas_item"/> </flyout_button> <button label="Annullér" name="discard_btn"/> - <button label="Mere >>" name="more_btn" tool_tip="Avancerede muligheder"/> - <button label="<< Mindre" name="less_btn" tool_tip="Avancerede muligheder"/> + <button label="Mere" name="more_btn" tool_tip="Avancerede muligheder"/> + <button label="Mindre" name="less_btn" tool_tip="Avancerede muligheder"/> <text name="type_label2"> Størrelse </text> @@ -59,7 +59,7 @@ <spinner label="Bredde" label_width="41" name="snapshot_width" width="101"/> <spinner label="Højde" label_width="32" left="117" name="snapshot_height" width="92"/> <check_box label="Fasthold proportioner" name="keep_aspect_check"/> - <slider label="Billed-kvalitet" name="image_quality_slider"/> + <slider label="Billedkvalitet" name="image_quality_slider"/> <text name="layer_type_label"> Benyt: </text> @@ -68,10 +68,10 @@ <combo_box.item label="Dybde" name="Depth"/> <combo_box.item label="Materinger" name="ObjectMattes"/> </combo_box> - <check_box label="Vis brugerflade på foto" name="ui_check"/> - <check_box label="Vis HUD objekter på foto" name="hud_check"/> + <check_box label="Snitflade" name="ui_check"/> + <check_box label="HUDs" name="hud_check"/> <check_box label="Luk ikke vindue ved gemning" name="keep_open_check"/> - <check_box label="Frys billede og vis" name="freeze_frame_check"/> + <check_box label="Fastfrys (fuldt billede)" name="freeze_frame_check"/> <check_box label="Auto-opdater" name="auto_snapshot_check"/> <string name="unknown"> ukendt diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml index b5cecf93e9..f203c2504f 100644 --- a/indra/newview/skins/default/xui/da/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sys_well_window" title="BESKEDER"> <string name="title_im_well_window"> - IM SESSIONER + SAMTALER </string> <string name="title_notification_well_window"> BESKEDER diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml index 00b49a9df9..fbc7fe2319 100644 --- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml @@ -17,7 +17,7 @@ <check_box label="Benyt ny" name="apply_immediate_check"/> <button label="" label_selected="" name="Pipette"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> - <button label="Ok" label_selected="Ok" name="Select"/> + <button label="OK" label_selected="OK" name="Select"/> <string name="pick title"> Vælg: </string> diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml index 3f19350e30..86c24d2c19 100644 --- a/indra/newview/skins/default/xui/da/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml @@ -1,15 +1,40 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="top_objects" title="Top objekter"> + <floater.string name="top_scripts_title"> + Mest krævende scripts + </floater.string> + <floater.string name="top_scripts_text"> + [COUNT] scripts bruger ialt [TIME] ms + </floater.string> + <floater.string name="scripts_score_label"> + Tid + </floater.string> + <floater.string name="scripts_mono_time_label"> + Mono tid + </floater.string> + <floater.string name="top_colliders_title"> + Mest kolliderende + </floater.string> + <floater.string name="top_colliders_text"> + Top [COUNT] genstande der potentielt har mange kollisioner + </floater.string> + <floater.string name="colliders_score_label"> + Point + </floater.string> + <floater.string name="none_descriptor"> + Ingen fundet + </floater.string> <text name="title_text"> Henter... </text> <scroll_list name="objects_list"> - <column label="Point" name="score"/> - <column label="Navn" name="name"/> - <column label="Ejer" name="owner"/> - <column label="Lokation" name="location"/> - <column label="Tid" name="time"/> - <column label="Mono tid" name="mono_time"/> + <scroll_list.columns label="Point" name="score"/> + <scroll_list.columns label="Navn" name="name"/> + <scroll_list.columns label="Ejer" name="owner"/> + <scroll_list.columns label="Lokation" name="location"/> + <scroll_list.columns label="Tid" name="time"/> + <scroll_list.columns label="Mono tid" name="mono_time"/> + <scroll_list.columns label="URL'er" name="URLs"/> </scroll_list> <text name="id_text"> Objekt ID: @@ -23,33 +48,9 @@ Ejer: </text> <button label="Filter" name="filter_owner_btn"/> + <button label="Genopfrisk" name="refresh_btn"/> <button label="Returnér valgte" name="return_selected_btn"/> <button label="Returnér alle" name="return_all_btn"/> <button label="Afbryd valgte" name="disable_selected_btn"/> <button label="Afbryd alle" name="disable_all_btn"/> - <button label="Genopfrisk" name="refresh_btn"/> - <string name="top_scripts_title"> - Mest krævende scripts - </string> - <string name="top_scripts_text"> - [COUNT] scripts bruger ialt [TIME] ms - </string> - <string name="scripts_score_label"> - Tid - </string> - <string name="scripts_mono_time_label"> - Mono tid - </string> - <string name="top_colliders_title"> - Mest kolliderende - </string> - <string name="top_colliders_text"> - Top [COUNT] genstande der potentielt har mange kollisioner - </string> - <string name="colliders_score_label"> - Point - </string> - <string name="none_descriptor"> - Ingen fundet - </string> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index 77906f0f46..6f61d9b310 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -4,7 +4,7 @@ <button label="Annullér" label_selected="Annullér" name="Cancel"/> <check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk"/> <text name="tos_heading"> - Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til [SECOND LIFE] skal du acceptere vilkårene. + Læs venligst følgende servicebetingelser grundigt. For at kunne logge på [SECOND_LIFE], skal du acceptere aftalen. </text> <text_editor name="tos_text"> TOS_TEXT diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml index 8651851233..05e9eb6cdd 100644 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml @@ -13,13 +13,14 @@ Opkald med [NAME] </string> <string name="no_one_near"> - Ingen nær + Ingen i nærheden har aktiveret stemmer </string> - <panel name="control_panel"> - <layout_stack> - <layout_panel name="leave_btn_panel"> - <button label="Forlad opkald" name="leave_call_btn"/> - </layout_panel> - </layout_stack> - </panel> + <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Min avatar:"/> + </layout_panel> + <layout_panel name="leave_call_btn_panel"> + <button label="Forlad opkald" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml index a70db6a6f1..17d5b9c205 100644 --- a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=""> - <button label="Gem" label_selected="Gem" name="Save" /> - <button label="Annullér" label_selected="Annullér" name="Cancel" /> + <button label="Gem" label_selected="Gem" name="Save"/> + <button label="Annullér" label_selected="Annullér" name="Cancel"/> <text name="Save item as:"> - Gem ting som:: + Gem genstand i min beholdning som: </text> <line_editor name="name ed"> Ny [DESC] diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml index d2f618579d..443e84b64a 100644 --- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="whitelist_entry"> +<floater name="whitelist_entry" title="GODKENDTE SIDER"> <text name="media_label"> Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner </text> diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml new file mode 100644 index 0000000000..db8ead21bd --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_window_size.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="window_size" title="VINDUE STØRRELSE"> + <string name="resolution_format"> + [RES_X] x [RES_Y] + </string> + <text name="windowsize_text"> + Sæt størrelse på vindue: + </text> + <combo_box name="window_size_combo" tool_tip="bredde x højde"> + <combo_box.item label="1000 x 700 (standard)" name="item0"/> + <combo_box.item label="1024 x 768" name="item1"/> + <combo_box.item label="1280 x 720 (720p)" name="item2"/> + <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + </combo_box> + <button label="Sæt" name="set_btn"/> + <button label="Annullér" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml index 137e8509a4..7d4a81d655 100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml @@ -6,64 +6,29 @@ </text> </panel> <panel> - <button label="Vis min position" label_selected="Vis min position" name="Show My Location" tool_tip="Centrér kort om min avatars position"/> - <text name="person_label"> + <text name="me_label"> Mig </text> - <check_box label="Beboer" name="people_chk"/> - <check_box label="Infohub" name="infohub_chk"/> - <text name="infohub_label"> - Infohub + <text name="person_label"> + Person </text> - <check_box label="Land til salg" name="land_for_sale_chk"/> - <text name="land_sale_label"> - Land til salg + <text name="by_owner_label"> + efter ejer </text> <text name="auction_label"> - af ejer - </text> - <button label="Tag hjem" label_selected="Tag hjem" name="Go Home" tool_tip="Teleportér til min hjemmelokation"/> - <text name="Home_label"> - Hjem + land auktion </text> - <text name="events_label"> - Events: + <text name="pg_label"> + Generelt </text> - <check_box label="PG" name="event_chk"/> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> <text name="mature_label"> - Mature + Moderat </text> - <check_box label="Adult" name="event_adult_chk"/> - </panel> - <panel> - <text name="find_on_map_label"> - Find på kort - </text> - </panel> - <panel> - <combo_box label="Venner online" name="friend combo" tool_tip="Vis venner på kort"> - <combo_box.item label="Mine venner online" name="item1"/> - </combo_box> - <combo_box label="Mine landemærker" name="landmark combo" tool_tip="Landemærke der skal vises på kort"> - <combo_box.item label="Mine landemærker" name="item1"/> - </combo_box> - <search_editor label="Regioner efter navn" name="location" tool_tip="Skriv navnet på en region"/> - <button label="Find" name="DoSearch" tool_tip="Søg efter en region"/> - <scroll_list name="search_results"> - <scroll_list.columns label="" name="icon"/> - <scroll_list.columns label="" name="sim_name"/> - </scroll_list> - <button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleportér til den valgte lokation"/> - <button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer denne lokation som SLurl der kan bruges på web."/> - <button label="Vis selektion" label_selected="Vis destination" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/> - </panel> - <panel> - <text name="zoom_label"> - Zoom + <text name="adult_label"> + Voksen </text> </panel> <panel> - <slider label="Zoom" name="zoom slider"/> + <button name="Clear" tool_tip="Fjern søgelinier og nulstil kort"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml index 1b85544303..d4bc0813e5 100644 --- a/indra/newview/skins/default/xui/da/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml @@ -13,7 +13,7 @@ <slider name="volume_slider" tool_tip="Stemme lydstyrke" value="0.5"/> <button label="Tilføj ven" name="add_friend_btn"/> <button label="IM" name="im_btn"/> - <button label="Mere" name="view_profile_btn"/> + <button label="Profil" name="view_profile_btn"/> <panel name="moderator_panel"> <button label="Slå stemme-chat fra" name="disable_voice"/> <button label="Slå stemme-chat til" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml index 29620fca27..6a6831c2e3 100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="Stå op" name="Stand Up"/> - <context_menu label="Tag af >" name="Take Off >"> - <context_menu label="Tøj >" name="Clothes >"> + <context_menu label="Tag af ▶" name="Take Off >"> + <context_menu label="Tøj ▶" name="Clothes >"> <menu_item_call label="Trøje" name="Shirt"/> <menu_item_call label="Bukser" name="Pants"/> <menu_item_call label="Nederdel" name="Skirt"/> @@ -16,8 +16,8 @@ <menu_item_call label="Alpha" name="Self Alpha"/> <menu_item_call label="Alt tøj" name="All Clothes"/> </context_menu> - <context_menu label="HUD >" name="Object Detach HUD"/> - <context_menu label="Tag af >" name="Object Detach"/> + <context_menu label="HUD ▶" name="Object Detach HUD"/> + <context_menu label="Tag af ▶" name="Object Detach"/> <menu_item_call label="Tag alt af" name="Detach All"/> </context_menu> <menu_item_call label="Udseende" name="Appearance..."/> diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml new file mode 100644 index 0000000000..4889230919 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_im_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="IM Well Button Context Menu"> + <menu_item_call label="Luk alle" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml index 5b8089bfe0..7434f2c3a2 100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml @@ -7,6 +7,7 @@ <menu_item_call label="Teleportér" name="teleport"/> <menu_item_call label="Invitér til gruppe" name="invite_to_group"/> <menu_item_call label="Blokér" name="block"/> + <menu_item_call label="Fjern blokering" name="unblock"/> <menu_item_call label="Rapportér" name="report"/> <menu_item_call label="Frys" name="freeze"/> <menu_item_call label="Smid ud" name="eject"/> @@ -14,4 +15,5 @@ <menu_item_call label="Find på kort" name="find_on_map"/> <menu_item_call label="Zoom ind" name="zoom_in"/> <menu_item_call label="Betal" name="pay"/> + <menu_item_call label="Del" name="share"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index 376af507d0..cdfcad9b1c 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml @@ -46,9 +46,10 @@ <menu_item_call label="Teleport" name="Landmark Open"/> <menu_item_call label="åben" name="Animation Open"/> <menu_item_call label="åben" name="Sound Open"/> + <menu_item_call label="Erstat påklædning" name="Replace Outfit"/> + <menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/> <menu_item_call label="Slet ting" name="Purge Item"/> <menu_item_call label="Genskab ting" name="Restore Item"/> - <menu_item_call label="Gå til link" name="Goto Link"/> <menu_item_call label="åben" name="Open"/> <menu_item_call label="Egenskaber" name="Properties"/> <menu_item_call label="Omdøb" name="Rename"/> @@ -57,13 +58,11 @@ <menu_item_call label="Indsæt" name="Paste"/> <menu_item_call label="Sæt ind som link" name="Paste As Link"/> <menu_item_call label="Slet" name="Delete"/> - <menu_item_call label="Tag ting af" name="Take Off Items"/> - <menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/> - <menu_item_call label="Erstat påklædning" name="Replace Outfit"/> + <menu_item_call label="Slet systemfolder" name="Delete System Folder"/> <menu_item_call label="start konference chat" name="Conference Chat Folder"/> <menu_item_call label="Afspil" name="Sound Play"/> <menu_item_call label="Om landemærke" name="About Landmark"/> - <menu_item_call label="Afspil offentligt" name="Animation Play"/> + <menu_item_call label="Afspil i verden" name="Animation Play"/> <menu_item_call label="Afspil lokalt" name="Animation Audition"/> <menu_item_call label="Send privat besked (IM)" name="Send Instant Message"/> <menu_item_call label="Tilbyd teleport..." name="Offer Teleport..."/> diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 0942f1b807..7fc7d43c20 100644 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml @@ -21,8 +21,8 @@ </menu> <menu_item_call label="Vis debug opsætning" name="Debug Settings"/> <menu_item_call label="UI/farve opsætning" name="UI/Color Settings"/> - <menu_item_call label="Vis sidebakke" name="Show Side Tray"/> <menu label="UI tests" name="UI Tests"/> + <menu_item_call label="Sæt vinduesstørrelse" name="Set Window Size..."/> <menu_item_call label="Vis betingelser" name="TOS"/> <menu_item_call label="Vis vigtig besked" name="Critical"/> <menu_item_call label="Test i web browser" name="Web Browser Test"/> diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml new file mode 100644 index 0000000000..40b35b5fdd --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Notification Well Button Context Menu"> + <menu_item_call label="Luk alle" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml index 0714b67ec3..232f3f64e2 100644 --- a/indra/newview/skins/default/xui/da/menu_object.xml +++ b/indra/newview/skins/default/xui/da/menu_object.xml @@ -6,18 +6,20 @@ <menu_item_call label="Åben" name="Open"/> <menu_item_call label="Sid her" name="Object Sit"/> <menu_item_call label="Objekt profil" name="Object Inspect"/> - <context_menu label="Sæt på >" name="Put On"> + <menu_item_call label="Zoom In" name="Zoom In"/> + <context_menu label="Tag på ▶" name="Put On"> <menu_item_call label="Tag på" name="Wear"/> - <context_menu label="Vedhæft >" name="Object Attach"/> - <context_menu label="Vedhæft HUD >" name="Object Attach HUD"/> + <context_menu label="Vedhæft ▶" name="Object Attach"/> + <context_menu label="Vedhæft HUD ▶" name="Object Attach HUD"/> </context_menu> - <context_menu label="Fjern >" name="Remove"> - <menu_item_call label="Tag" name="Pie Object Take"/> + <context_menu label="Fjern ▶" name="Remove"> <menu_item_call label="Rapportér misbrug" name="Report Abuse..."/> <menu_item_call label="Blokér" name="Object Mute"/> <menu_item_call label="Returnér" name="Return..."/> <menu_item_call label="Slet" name="Delete"/> </context_menu> + <menu_item_call label="Køb" name="Pie Object Bye"/> + <menu_item_call label="Tag" name="Pie Object Take"/> <menu_item_call label="Tag kopi" name="Take Copy"/> <menu_item_call label="Betal" name="Pay..."/> <menu_item_call label="Køb" name="Buy..."/> diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml index 44a016026c..c2595dcb3d 100644 --- a/indra/newview/skins/default/xui/da/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Participant List Context Menu"> + <menu_item_check label="Sortér efter navn" name="SortByName"/> + <menu_item_check label="Sortér efter nylige talere" name="SortByRecentSpeakers"/> <menu_item_call label="Profil" name="View Profile"/> <menu_item_call label="Tilføj ven" name="Add Friend"/> <menu_item_call label="Send besked" name="IM"/> <menu_item_call label="Opkald" name="Call"/> <menu_item_call label="Del" name="Share"/> <menu_item_call label="Betal" name="Pay"/> - <menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/> - <menu_item_check label="Sluk for tekst" name="MuteText"/> - <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/> - <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/> - <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/> - <menu_item_call label="Åben for denne deltager" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Åben for alle andre" name="ModerateVoiceUnMuteOthers"/> + <menu_item_check label="Blokér stemme" name="Block/Unblock"/> + <menu_item_check label="Blokér tekst" name="MuteText"/> + <context_menu label="Moderator muligheder >" name="Moderator Options"> + <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/> + <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/> + <menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/> + </context_menu> </context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml new file mode 100644 index 0000000000..841f58b619 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_call label="Se info" name="View Info"/> + <menu_item_call label="Chat" name="Chat"/> + <menu_item_call label="Opkald" name="Call"/> + <menu_item_call label="Aktivér" name="Activate"/> + <menu_item_call label="Forlad" name="Leave"/> +</menu> diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml index 224190149b..5470c32761 100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml @@ -2,9 +2,12 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Profil" name="View Profile"/> <menu_item_call label="Tilføj ven" name="Add Friend"/> + <menu_item_call label="Fjern ven" name="Remove Friend"/> <menu_item_call label="Besked" name="IM"/> <menu_item_call label="Opkald" name="Call"/> + <menu_item_call label="Kort" name="Map"/> <menu_item_call label="Del" name="Share"/> <menu_item_call label="Betal" name="Pay"/> <menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/> + <menu_item_call label="Tilbyd teleport" name="teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml index 92c6d2c960..08b7136b97 100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> <menu_item_call label="Tilføj venner" name="Add Friends"/> + <menu_item_call label="Fjern venner" name="Remove Friend"/> <menu_item_call label="Besked" name="IM"/> <menu_item_call label="Opkald" name="Call"/> <menu_item_call label="Del" name="Share"/> diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml index 58fbc62643..9609b424a1 100644 --- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml @@ -2,4 +2,10 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="Betal" name="pay"/> <menu_item_call label="Del" name="share"/> + <menu_item_call label="Blokér" name="block"/> + <menu_item_call label="Fjern blokering" name="unblock"/> + <menu_item_call label="Spark" name="kick"/> + <menu_item_call label="Frys" name="freeze"/> + <menu_item_call label="Fjern frys" name="unfreeze"/> + <menu_item_call label="Kundeservicemedarbejder (CSR)" name="csr"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index ec0631d54f..18ad7cfffa 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -7,8 +7,8 @@ <menu_item_call label="Profil" name="Profile"/> <menu_item_call label="Udseende" name="Appearance"/> <menu_item_check label="Beholdning" name="Inventory"/> - <menu_item_call label="Vis beholdning i sidebakke" name="ShowSidetrayInventory"/> - <menu_item_call label="Mine bevægelser" name="Gestures"/> + <menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/> + <menu_item_check label="Mine bevægelser" name="Gestures"/> <menu label="Min status" name="Status"> <menu_item_call label="Væk" name="Set Away"/> <menu_item_call label="Optaget" name="Set Busy"/> @@ -22,35 +22,36 @@ <menu_item_call label="Grupper" name="My Groups"/> <menu_item_check label="Chat i nærheden" name="Nearby Chat"/> <menu_item_call label="Personer tæt på" name="Active Speakers"/> - <menu_item_check label="Media i nærheden" name="Nearby Media"/> </menu> <menu label="Verden" name="World"> - <menu_item_check label="Flyt" name="Movement Controls"/> - <menu_item_check label="Vis" name="Camera Controls"/> - <menu_item_call label="Om land" name="About Land"/> - <menu_item_call label="Region/Estate" name="Region/Estate"/> - <menu_item_call label="Køb land" name="Buy Land"/> + <menu_item_check label="Mini-kort" name="Mini-Map"/> + <menu_item_check label="Verdenskort" name="World Map"/> + <menu_item_call label="Foto" name="Take Snapshot"/> + <menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/> + <menu label="Profil for sted" name="Land"> + <menu_item_call label="Om land" name="About Land"/> + <menu_item_call label="Region/Estate" name="Region/Estate"/> + </menu> + <menu_item_call label="Køb dette land" name="Buy Land"/> <menu_item_call label="Mit land" name="My Land"/> - <menu label="Vis" name="Land"> - <menu_item_check label="Ban Lines" name="Ban Lines"/> + <menu label="Vis" name="LandShow"> + <menu_item_check label="Bevægelses kontrol" name="Movement Controls"/> + <menu_item_check label="Vis kontroller" name="Camera Controls"/> + <menu_item_check label="'Ingen adgang' markering" name="Ban Lines"/> <menu_item_check label="Pejlelys" name="beacons"/> <menu_item_check label="Parcel skel" name="Property Lines"/> - <menu_item_check label="Land-ejere" name="Land Owners"/> - </menu> - <menu label="Landemærker" name="Landmarks"> - <menu_item_call label="Opret landemærke her" name="Create Landmark Here"/> - <menu_item_call label="Sæt hjem til her" name="Set Home to Here"/> + <menu_item_check label="Grundejere" name="Land Owners"/> + <menu_item_check label="Koordinater" name="Coordinates"/> + <menu_item_check label="Parcel egenskaber" name="Parcel Properties"/> </menu> - <menu_item_call label="Hjem" name="Teleport Home"/> - <menu_item_check label="Mini-kort" name="Mini-Map"/> - <menu_item_check label="Verdenskort" name="World Map"/> - <menu_item_call label="Foto" name="Take Snapshot"/> + <menu_item_call label="Teleport hjem" name="Teleport Home"/> + <menu_item_call label="Sæt dette sted som 'Hjem'" name="Set Home to Here"/> <menu label="Sol" name="Environment Settings"> <menu_item_call label="Solopgang" name="Sunrise"/> <menu_item_call label="Middag" name="Noon"/> <menu_item_call label="Solnedgang" name="Sunset"/> <menu_item_call label="Midnat" name="Midnight"/> - <menu_item_call label="Benyt tid fra estate" name="Revert to Region Default"/> + <menu_item_call label="Estate tid" name="Revert to Region Default"/> <menu_item_call label="Redigering af omgivelser" name="Environment Editor"/> </menu> </menu> @@ -76,10 +77,12 @@ </menu> <menu_item_call label="Sammenkæde" name="Link"/> <menu_item_call label="Adskil" name="Unlink"/> + <menu_item_check label="Redigér sammekædede objekter" name="Edit Linked Parts"/> <menu_item_call label="Fokusér på valgte" name="Focus on Selection"/> <menu_item_call label="Zoom til valgte" name="Zoom to Selection"/> <menu label="Objekt" name="Object"> - <menu_item_call label="Køb" name="Menu Object Take"/> + <menu_item_call label="Køb" name="Menu Object Buy"/> + <menu_item_call label="Tag" name="Menu Object Take"/> <menu_item_call label="Tag kopi" name="Take Copy"/> <menu_item_call label="Opdatér ændringer til beholdning" name="Save Object Back to My Inventory"/> <menu_item_call label="Opdater ændringer i indhold til objekt" name="Save Object Back to Object Contents"/> @@ -92,25 +95,18 @@ <menu_item_call label="Sæt scripts til "Not Running"" name="Set Scripts to Not Running"/> </menu> <menu label="Valg" name="Options"> - <menu_item_check label="Redigér sammenlænkede dele" name="Edit Linked Parts"/> <menu_item_call label="Sæt standard rettigheder" name="perm prefs"/> <menu_item_check label="Vis avancerede rettigheder" name="DebugPermissions"/> - <menu label="Selektion" name="Selection"> - <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/> - <menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects"/> - <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/> - </menu> - <menu label="Vis" name="Show"> - <menu_item_check label="Vis skjult selektion" name="Show Hidden Selection"/> - <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/> - <menu_item_check label="Vis udvælgelses stråle" name="Show Selection Beam"/> - </menu> - <menu label="Gitter" name="Grid"> - <menu_item_check label="Ret ind til gitter" name="Snap to Grid"/> - <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/> - <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/> - <menu_item_call label="Gitter valg" name="Grid Options"/> - </menu> + <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/> + <menu_item_check label="Vis kun flytbare objekter" name="Select Only Movable Objects"/> + <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/> + <menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection"/> + <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/> + <menu_item_check label="Vis pejlelys for valgte" name="Show Selection Beam"/> + <menu_item_check label="Ret ind til gitter" name="Snap to Grid"/> + <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/> + <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/> + <menu_item_call label="Gitter indstillinger" name="Grid Options"/> </menu> <menu label="Vis lænkede dele" name="Select Linked Parts"> <menu_item_call label="Vælg næste del" name="Select Next Part"/> @@ -121,15 +117,14 @@ </menu> <menu label="Hjælp" name="Help"> <menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/> - <menu_item_call label="Tutorial" name="Tutorial"/> <menu_item_call label="Rapporter misbrug" name="Report Abuse"/> <menu_item_call label="Rapportér fejl" name="Report Bug"/> </menu> <menu label="Avanceret" name="Advanced"> - <menu_item_check label="Sæt til "væk" efter 30 minutter" name="Go Away/AFK When Idle"/> <menu_item_call label="Stop animering af min avatar" name="Stop Animating My Avatar"/> <menu_item_call label="Gendan teksturer" name="Rebake Texture"/> <menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/> + <menu_item_call label="Vælg vinduesstørrelse..." name="Set Window Size..."/> <menu_item_check label="Begræns valg afstand" name="Limit Select Distance"/> <menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/> <menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/> @@ -176,8 +171,8 @@ <menu_item_check label="Kør flere tråde" name="Run Multiple Threads"/> <menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/> <menu_item_check label="Muse udjævning" name="Mouse Smoothing"/> - <menu_item_check label="Vis IM's i lokal chat" name="IMInChat"/> <menu label="Shortcuts" name="Shortcuts"> + <menu_item_call label="Billede (L$[COST])..." name="Upload Image"/> <menu_item_check label="Søg" name="Search"/> <menu_item_call label="Frigør taster" name="Release Keys"/> <menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/> @@ -217,6 +212,7 @@ <menu_item_call label="Vis Regionsinfo i debug-konsol" name="Region Info to Debug Console"/> <menu_item_check label="Kamera" name="Camera"/> <menu_item_check label="Vind" name="Wind"/> + <menu_item_check label="Badge" name="Badge"/> </menu> <menu label="Vis info" name="Display Info"> <menu_item_check label="Vis tid" name="Show Time"/> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 42eac1be7a..9193bd43e8 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -11,18 +11,29 @@ </global> <template name="okbutton"> <form> - <button name="OK" text="$yestext"/> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> </form> </template> - <template name="okignore"/> <template name="okcancelbuttons"> <form> - <button name="Cancel" text="$notext"/> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> </form> </template> - <template name="okcancelignore"/> <template name="okhelpbuttons"> <form> + <button name="OK_okhelpbuttons" text="$yestext"/> <button name="Help" text="$helptext"/> </form> </template> @@ -30,6 +41,7 @@ <form> <button name="Yes" text="$yestext"/> <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification functor="GenericAcknowledge" label="Ukendt notificeringsbesked" name="MissingAlert"> @@ -93,13 +105,17 @@ Vælg kun en genstand, og prøv igen. Gem alle ændringer til tøj/krops dele? <usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/> </notification> + <notification name="FriendsAndGroupsOnly"> + 'Ikke-venner' vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM) + <usetemplate name="okbutton" yestext="Ja"/> + </notification> <notification name="GrantModifyRights"> - At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse. + At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse. Ønsker du at ændre rettigheder for [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/> </notification> <notification name="GrantModifyRightsMultiple"> - At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse. + At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse. Ønsker du at ændre rettigheder for de valgte beboere? <usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/> </notification> @@ -142,8 +158,15 @@ Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet med Add this Ability to '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/> </notification> - <notification name="ClickUnimplemented"> - Beklager, ikke implementeret endnu. + <notification name="AttachmentDrop"> + Du er ved at smide et vedhæng. + Er du sikker på at du vil fortsætte? + <usetemplate ignoretext="Bekræft før vedhæng smides" name="okcancelignore" notext="Nej" yestext="Ja"/> + </notification> + <notification name="JoinGroupNoCost"> + Du melder dig ind i gruppen [NAME]. +Ønsker du at fortsætte? + <usetemplate name="okcancelbuttons" notext="Annullér" yestext="Bliv medlem"/> </notification> <notification name="JoinGroupCannotAfford"> Tilmelding til denne gruppe koster L$[COST]. @@ -197,13 +220,9 @@ Jo mere du betaler, jo højere oppe på listen vises annoncen, og den vil også Er du sikker på at du vil fortsætte? <usetemplate ignoretext="Bekræft før jeg slette media i et objekt" name="okcancelignore" notext="Nej" yestext="Ja"/> </notification> - <notification name="ResetShowNextTimeDialogs"> - Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist? - <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/> - </notification> - <notification name="SkipShowNextTimeDialogs"> - Vil du deaktivere alle popups som kan undværes? - <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/> + <notification name="ClassifiedInsufficientFunds"> + Ikke nok penge til at oprette annonce. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CacheWillClear"> Cache vil blive tømt ved næste genstart af [APP_NAME]. @@ -224,11 +243,14 @@ Indtast venligst navn på region i Start lokation feltet eller vælg "Min s <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="UnsupportedHardware"> + Bare så du ved det, din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan opleve dårlig hastighed. Desværre kan [SUPPORT_SITE] ikke give teknisk support til ikke-supporterede konfigurationer. +MINSPECS +Besøg [_URL] for mere information? <usetemplate ignoretext="Din computer hardware understøttes ikke" name="okcancelignore" notext="No" yestext="Yes"/> </notification> <notification name="UnknownGPU"> - Dit system har et grafikkort som er ukendt for [APP_NAME] lige nu. -Dette er tilfældet med nyt hardware som endnu ikke er blevet testet med [APP_NAME]. [APP_NAME] vil sandsynligvis kunne køre normalt, men det kan være nødvendigt at justere opsætningen af grafik. + Dit system indeholder et grafikkort som [APP_NAME] ikke kan genkende. +Dette skyldes ofte nyt hardware som endnu ikke er blevet testet med [APP_NAME]. Kortet vil sandsynligvis virke fint, med det kan være nødvendigt at justere grafik opsætningen. (Mig > Indstillinger > Grafik). <form name="form"> <ignore name="ignore" text="Dit grafikkort kunne ikke identificeres"/> @@ -260,9 +282,17 @@ Gå til [_URL] for information om køb af L$? <notification name="LandmarkCreated"> Du har tilføjet "[LANDMARK_NAME]" til din [FOLDER_NAME] mappe. </notification> + <notification name="LandmarkAlreadyExists"> + Du har allerede et landemærke for denne lokation. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CannotOpenScriptObjectNoMod"> Ikke muligt at åbne script i objekt uden 'Redigére' rettigheder. </notification> + <notification name="CouldNotTeleportReason"> + Teleport fejlede. +[REASON] + </notification> <notification name="invalid_tport"> Der opstod et problem ved din teleport. Det kan være nødvendigt at logge ind igen, før du kan teleporte. Hvis du bliver ved med at få denne fejl, check venligst [SUPPORT_SITE]. @@ -305,6 +335,10 @@ Prøv evt. igen om lidt. <notification name="no_inventory_host"> Beholdningssystemet er ikke tilgængelig lige nu. </notification> + <notification name="ForceOwnerAuctionWarning"> + Denne parcel er sat på auktion. Gennemtving ejerskab vil annullere denne auktion og måske irritere nogen beboere hvis bud allerede er afgivet. +Gennemtving ejerskab? + </notification> <notification name="CannotBuyLandNoRegion"> Ikke i stand til at købe land: Kan ikke finde region som dette land er i. @@ -316,13 +350,6 @@ Kan ikke finde region som dette land er i. Land kunne ikke dedikeres: Kunne ikke finde den region land ligger i. </notification> - <notification name="ParcelCanPlayMedia"> - Dette sted kan afspille 'streaming media'. -'Streaming media' kræver en hurtig internet opkobling. - -Afspil altid 'streaming media' når det er tilgængeligt? -(Du kan ændre dette valg senere under Indstillinger > Privatliv.) - </notification> <notification name="CannotReleaseLandRegionNotFound"> Kunne ikke efterlade land: Kan ikke finde den region landet ligger i. @@ -340,9 +367,8 @@ Kan ikke finde den region landet ligger i. Dette er typisk en midlertidig fejl. Venligst rediger og gem igen om et par minutter. </notification> <notification name="YouHaveBeenLoggedOut"> - Du er blevet logget af [SECOND_LIFE]: + Du er blevet logget af [SECOND_LIFE] [MESSAGE] -Du kan stadig se igangværende samtaler (IM) og chat ved at klikke på 'Se IM & chat. Ellers klik på 'Afslut' for at lukke [APP_NAME] med det samme. <usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB & Chat"/> </notification> <notification label="Tilføj ven" name="AddFriend"> @@ -365,6 +391,9 @@ Tilbyd venskab til [NAME]? <button name="Cancel" text="Annullér"/> </form> </notification> + <notification name="ErrorMessage"> + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="AvatarMovedDesired"> Den ønskede lokation er ikke tilgængelig lige nu. Du er blevet flyttet til en region in nærheden. @@ -511,9 +540,12 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a <usetemplate ignoretext="Jeg skrifter min status til 'optaget" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> - Du har nået det maksimale antal grupper. Du skal forlade en anden gruppe for at kunne være med i denne - eller afvis tilbudet. -[NAME] har inviteret dig til at være medlem af en gruppe. -[INVITE] + Du er oppe på det maksimale antal grupper. Forlad venligst en anden gruppe inden du melder dig ind i denne, eller afvis tilbuddet. +[NAME] har inviteret dig til en gruppe. + </notification> + <notification name="JoinedTooManyGroups"> + Du er oppe på det maksimale antal grupper. Forlad venligst en gruppe inden du melder dig ind i enndnu en gruppe eller opretter en ny. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OfferTeleport"> <form name="form"> @@ -525,6 +557,7 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a </form> </notification> <notification name="TeleportFromLandmark"> + Er du sikker på at du vil teleportere til <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Bekræft at jeg vil teleportere til et landemærke" name="okcancelignore" notext="Cancel" yestext="Teleport"/> </notification> <notification name="TeleportToPick"> @@ -626,6 +659,12 @@ Du kan klikke på 'Ændre præference' for at ændre din indholdsratin Indeholder denne gruppe 'Mature' indhold? <usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Nej" yestext="Ja"/> </notification> + <notification label="Changed Region Maturity" name="RegionMaturityChange"> + Ratingen for denne region er ændret. +Det kan tage noget tid inden ændringen slår igennem på kortet. + +For at få adgang til voksen regioner, skal beboere være alders-checket, enten via aldersverifikation eller betalingsverifikation. + </notification> <notification label="Voice Version Mismatch" name="VoiceVersionMismatch"> Denne version af [APP_NAME] er ikke kompatibel med stemme chat funktionen i denne region. For at kunne få stemme chat til at fungere skal du opdatere [APP_NAME]. </notification> @@ -649,9 +688,9 @@ Du kan klikke på 'Ændre præference' for at ændre din indholdsratin <usetemplate ignoretext="Bekræft før jeg afslutter" name="okcancelignore" notext="Afslut ikke" yestext="Quit"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Benyt dette værktøj til at rapportere Use this tool to report krænkelser af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards]. + Benyt dette værktøj til at rapportere krænkninger af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards]. -Alle indrapporterede krænkelser er undersøgt og and afgjort. Du kan se løsning ved at læse [http://secondlife.com/support/incidentreport.php Incident Report]. +Alle rapporter om krænkninger vil blive undersøgt og behandlet. </notification> <notification name="HelpReportAbuseContainsCopyright"> Kære beboer, @@ -792,8 +831,7 @@ Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokati Bevægelsen [NAME] mangler i databasen. </notification> <notification name="UnableToLoadGesture"> - Ikke muligt at indlæse gestus [NAME]. -Prøv venligst igen. + Kunne ikke indlæse læse bevægelse [NAME]. </notification> <notification name="LandmarkMissing"> Landmærke mangler i databasen. @@ -885,10 +923,9 @@ Click on any landmark to select it, then click 'Teleport' at the botto (You can also double-click on the landmark, or right-click it and choose 'Teleport'.) </notification> <notification name="TeleportToPerson"> - Du kan kontakte beboere som f.eks. '[NAME]' ved at åbne 'Personer' panelet til højre på skærmen. -Vælg beboeren fra listen og klik så på 'IM' i bunden af panelet. -(Du kan også dobbelt-klikke på navnet i listen eller højreklikke og vælge 'IM') -(You can also double-click on their name in the list, or right-click and choose 'IM'). + Du kan kontakte beboere som '[NAME]' ved at åbne Personer panelet til højre på skærmen. +Vælg beboeren fra listen og klik så 'IM' i bundet af panelet. +(Du kan også dobbelt-klikke på navnet i listen, eller højre-klikke og vælge 'IM'). </notification> <notification name="CantSelectLandFromMultipleRegions"> Kan ikke vælge land på tværs af grænser. @@ -959,7 +996,7 @@ Prøv venligst at geninstallere plugin eller kontakt leverandøren hvis probleme Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning. </notification> <notification name="OtherObjectsReturned2"> - Genstandene på det valgte stykke land der er ejet af beboeren '[NAME]' er blevet returneret til deres ejere. + Objekterne i den valgte parcel, ejet af beboeren '[NAME]', er blevet returneret til deres ejer. </notification> <notification name="GroupObjectsReturned"> Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger. @@ -971,7 +1008,7 @@ Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet sl </notification> <notification name="ServerObjectMessage"> Besked fra [NAME]: -[MSG] +<nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> Dette land er åbnet for 'skade'. @@ -1080,7 +1117,7 @@ Prøv igen om lidt. No valid parcel could be found. </notification> <notification name="ObjectGiveItem"> - Et objekt med navnet [OBJECTFROMNAME], ejet af [NAME_SLURL], har givet dig [OBJECTTYPE]: + Et objekt med navnet [OBJECTFROMNAME] ejet af [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button name="Keep" text="Behold"/> @@ -1089,7 +1126,7 @@ Prøv igen om lidt. </form> </notification> <notification name="ObjectGiveItemUnknownUser"> - Et objekt med navnet [OBJECTFROMNAME], ejet af en ukendt beboer, har givet dig [OBJECTTYPE]: + Et objekt med navnet [OBJECTFROMNAME] ejet af (en ukendt beboer) har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button name="Keep" text="Behold"/> @@ -1098,12 +1135,12 @@ Prøv igen om lidt. </form> </notification> <notification name="UserGiveItem"> - [NAME_SLURL] har givet dig [OBJECTTYPE]: + [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> - <button name="Keep" text="Behold"/> <button name="Show" text="Vis"/> <button name="Discard" text="Smid væk"/> + <button name="Mute" text="Blokér"/> </form> </notification> <notification name="GodMessage"> @@ -1128,6 +1165,9 @@ Prøv igen om lidt. <button name="Cancel" text="Annullér"/> </form> </notification> + <notification name="TeleportOfferSent"> + Tilbud om teleport sendt til [TO_NAME] + </notification> <notification name="GotoURL"> [MESSAGE] [URL] @@ -1154,9 +1194,15 @@ Som standard vil du kunne se andres onlinestatus. <notification name="FriendshipDeclined"> [NAME] afviste dit tilbud om venskab. </notification> + <notification name="FriendshipAcceptedByMe"> + Tilbud om venskab accepteret. + </notification> + <notification name="FriendshipDeclinedByMe"> + Tilbud om venskab afvist. + </notification> <notification name="OfferCallingCard"> - [FIRST] [LAST] tilbyder vedkommendes visitkort. -Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer. + [FIRST] [LAST] tilbyder dig et visitkort. +Dette vil lave et bogmørke i din beholding, så du hurtigt kan sende en IM til denne beboer. <form name="form"> <button name="Accept" text="Acceptér"/> <button name="Decline" text="Afvis"/> @@ -1235,14 +1281,6 @@ Tillad denne anmodning? <button name="Block" text="Blokér"/> </form> </notification> - <notification name="FirstBalanceIncrease"> - Du har netop modtaget [AMOUNT] L$. -Din balance vises øverst til højre. - </notification> - <notification name="FirstBalanceDecrease"> - Du har netop betalt [AMOUNT] L$. -Din balance vises øverst til højre. - </notification> <notification name="BuyLindenDollarSuccess"> Tak for din betaling! @@ -1250,58 +1288,17 @@ Din L$ balance vil blive opdateret når transaktionen er gennemført. Ved transa Status for din betaling kan ses i din 'Transaction History' side på din [http://secondlife.com/account/ Dashboard] </notification> - <notification name="FirstSit"> - Du sidder ned. -Benyt piletasterne (eller AWSD) til at se rundt. -Klik på 'Stå op' tasten for at rejse dig. - </notification> - <notification name="FirstMap"> - Klik og træk på kortet for at se rundt. -Dobbelt-klik for at teleportere. -Benyt kontrollerne til højre for at finde ting og se forskellige baggrunde. - </notification> - <notification name="FirstBuild"> - Du har åbnet bygge værktøjer. Alle objekter du ser omkring dig er lavet via disse værktøjer. - </notification> - <notification name="FirstTeleport"> - Du kan kun teleportere til bestemte områder i denne region. Pilen peger på din specifikke destination. Klik på pilen for at fjerne den. - </notification> <notification name="FirstOverrideKeys"> Dine bevælgelsestaster bliver nu håndteret af et objekt. Brug piletasterne eller AWSD for at se, hvad de gør. Nogle genstande (som skydevåben) kræver at du går ind i musevisning for at bruge dem. Tryk på 'M' for at gåre det. </notification> - <notification name="FirstAppearance"> - Du redigerer dit udseende. -Benyt piletasterne til at se rundt. -Når du er færdig, tryk på 'Gem alt'. - </notification> - <notification name="FirstInventory"> - Dette er din beholdning, som indeholder de genstande du ejer. - -* For at tage noget på, træk det over på dig selv. -* For at 'rezze' noget, træk det over på jorden. -* For at læse en note, dobbelt-klik på den. - </notification> <notification name="FirstSandbox"> Dette er et sandkasse område. Her kan beboere lære ast bygge. De ting du bygger vil blive slettet senere, så glem ikke at højre-klikke og vælge "Tag" for at tage en kopi af din kreation til din beholdning. </notification> - <notification name="FirstFlexible"> - Dette objekt er fleksibelt/blødt. Sådanne objekter skal være 'uden masse' og ikke fysiske. - </notification> - <notification name="FirstDebugMenus"> - Du har åbnet menuen 'Avanceret'. - -For at slå denne menu fra og til, - Windows: Ctrl+Alt+D - Mac: ⌥⌘D - </notification> - <notification name="FirstSculptedPrim"> - Du redigerer en 'Sculpted prim'. Sådanne objekter kræver en speciel tekstur for at definere faconen. - </notification> <notification name="MaxListSelectMessage"> Du må kun vælge op til [MAX_SELECT] genstande på denne liste. </notification> @@ -1408,6 +1405,10 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager. <button name="respondbutton" text="Svar"/> </form> </notification> + <notification name="ConfirmCloseAll"> + Er du sikker på at du vil lukke alle personlige samtaler (IM)? + <usetemplate name="okcancelignore" notext="Annullér" yestext="OK"/> + </notification> <notification name="AttachmentSaved"> Vedhæng er blevet gemt. </notification> diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml index ab2e7a6e31..1953fad31f 100644 --- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <panel name="panel_call_buttons"> - <button label="Opkald" name="call_btn"/> - <button label="Forlad samtale" name="end_call_btn"/> - <button label="Stemmekontroller" name="voice_ctrls_btn"/> - </panel> + <layout_stack name="vertical_stack"> + <layout_panel name="call_btn_panel"> + <button label="Opkald" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Forlad opkald" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Stemmekontroller" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml index a9d5ba73ac..56332c00e6 100644 --- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml @@ -22,4 +22,5 @@ [COUNT]å </string> <text name="avatar_name" value="Ukendt"/> + <button name="profile_btn" tool_tip="Vis profil"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml index 986a4131de..4f5041ad54 100644 --- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> <text name="title_text"> - Blokérede avatarer + Blokerede </text> - <scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/> + <scroll_list name="blocked" tool_tip="Liste med beboerer der p.t. er blokeret"/> <button label="Blokér beboer..." label_selected="Blokér beboer..." name="Block resident..." tool_tip="Vælg en beboer der skal blokeres"/> <button label="Blokér objekt via navn..." label_selected="Blokér objekt via navn..." name="Block object by name..."/> - <button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjern beboer fra liste med blokeringer"/> + <button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjerm en beboer fra blokeringslisten"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml index 2085840bb5..4a038e89ba 100644 --- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml @@ -7,8 +7,13 @@ Skjuler/viser stemme kontrol panel </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Tal" label_selected="Tal" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> - <gesture_combo_box label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/> + <gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/> </layout_panel> <layout_panel name="movement_panel"> <button label="Flyt" name="movement_btn" tool_tip="Vis/skjul bevægelseskontroller"/> @@ -19,5 +24,15 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Tag foto"/> </layout_panel> + <layout_panel name="im_well_panel"> + <chiclet_im_well name="im_well"> + <button name="Unread IM messages" tool_tip="Konversationer"/> + </chiclet_im_well> + </layout_panel> + <layout_panel name="notification_well_panel"> + <chiclet_notification name="notification_well"> + <button name="Unread" tool_tip="Notifikationer"/> + </chiclet_notification> + </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..bd31253ca4 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Vis/skjul bevægelser"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml index a9cce7bf45..6eba024981 100644 --- a/indra/newview/skins/default/xui/da/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_classified_info"> + <panel.string name="l$_price"> + L$[PRICE] + </panel.string> <text name="title" value="Annonce info"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="classified_name" value="[name]"/> - <text name="classified_location" value="[loading...]"/> - <text name="content_type" value="[content type]"/> - <text name="category" value="[category]"/> + <text_editor name="classified_name" value="[name]"/> + <text_editor name="classified_location" value="[loading...]"/> + <text_editor name="content_type" value="[content type]"/> + <text_editor name="category" value="[category]"/> <check_box label="Forny automatisk hver uge" name="auto_renew"/> - <text name="price_for_listing" tool_tip="Pris for optagelse."> - L$[PRICE] - </text> - <text name="classified_desc" value="[description]"/> + <text_editor name="price_for_listing" tool_tip="Pris for optagelse."/> + <text_editor name="classified_desc" value="[description]"/> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml index d3cfdbba52..85461e23a7 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml @@ -35,9 +35,12 @@ </text> <check_box label="Vis mig i søgeresultater" name="show_in_search_checkbox"/> <text name="title_acc_status_text" value="Min konto:"/> + <text_editor name="acc_status_text" value="Beboer. Ingen betalingsinfo."/> <text name="my_account_link" value="[[URL] Go to My Dashboard]"/> - <text name="acc_status_text" value="Beboer. Ingen betalingsinfo."/> <text name="title_partner_text" value="Min partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(henter)" name="partner_text"/> + </panel> <text name="partner_edit_link" value="[[URL] Edit]"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_friends.xml b/indra/newview/skins/default/xui/da/panel_friends.xml index a41eaf20c1..a1a25bdc77 100644 --- a/indra/newview/skins/default/xui/da/panel_friends.xml +++ b/indra/newview/skins/default/xui/da/panel_friends.xml @@ -16,5 +16,5 @@ <button label="Teleport" name="offer_teleport_btn" tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position"/> <button label="Betal" name="pay_btn" tool_tip="Giv Linden dollars (L$) til denne ven"/> <button label="Fjern" name="remove_btn" tool_tip="Fjern denne beboer fra din venneliste"/> - <button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til denne beboer"/> + <button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til en beboer"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml index 1db2db45af..26fe4f6ebe 100644 --- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <button label="Group Profile" name="group_info_btn"/> - <panel name="panel_call_buttons"> - <button label="Opkaldsgruppe" name="call_btn"/> - <button label="Forlad samtale" name="end_call_btn"/> - <button label="Kontroller for åben stemmechat" name="voice_ctrls_btn"/> - </panel> + <layout_stack name="vertical_stack"> + <layout_panel name="group_info_btn_panel"> + <button label="Gruppe profil" name="group_info_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Opkald gruppe" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Forlad opkald" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Åben stemmekontroller" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml index ec957e6094..becb5ab70a 100644 --- a/indra/newview/skins/default/xui/da/panel_group_general.xml +++ b/indra/newview/skins/default/xui/da/panel_group_general.xml @@ -9,20 +9,38 @@ <panel.string name="incomplete_member_data_str"> Henter medlemsinformationer </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="Klik for at vælge et billede"/> + <text name="prepend_founded_by"> + Grundlagt af: + </text> + <name_box initial_value="(henter)" name="founder_name"/> + <text name="join_cost_text"> + Gratis + </text> + <button label="TILMELD NU!" name="btn_join"/> + </panel> <text_editor name="charter"> Gruppens formål </text_editor> <name_list name="visible_members"> <name_list.columns label="Medlem" name="name"/> <name_list.columns label="Titel" name="title"/> + <name_list.columns label="Status" name="status"/> </name_list> + <text name="my_group_settngs_label"> + MeMig + </text> <text name="active_title_label"> - Min titel + Min titel: </text> <combo_box name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv"/> <check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe. Fjern markeringen i boksen hvis gruppen spammer dig."/> <check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/> <panel name="preferences_container"> + <text name="group_settngs_label"> + Gruppe + </text> <check_box label="Åben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/> <check_box label="Tilmeldingsgebyr" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen"/> <spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når "Tilmeldingsgebyr" er valgt." width="60"/> diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml index 9940ebbd4d..a7aa842439 100644 --- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Gruppe info" name="GroupInfo"> +<panel label="Gruppe profil" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - Der er ændringer på denne fane der ikke er gemt + Der er ændringer der ikke er gemt </panel.string> <panel.string name="want_apply_text"> Ønsker du at gemme disse ændringer? @@ -12,25 +12,24 @@ <panel.string name="group_join_free"> Gratis </panel.string> - <text name="group_name" value="(Henter...)"/> - <line_editor label="Indtast dit nye gruppenavn her" name="group_name_editor"/> - <texture_picker label="" name="insignia" tool_tip="Klik for at vælge bilede"/> - <text name="prepend_founded_by"> - Grundlægger: - </text> - <name_box initial_value="(finder)" name="founder_name"/> - <text name="join_cost_text"> - Gratis - </text> - <button label="MELD IND NU!" name="btn_join"/> - <accordion name="groups_accordion"> - <accordion_tab name="group_general_tab" title="Generelt"/> - <accordion_tab name="group_roles_tab" title="Roller"/> - <accordion_tab name="group_notices_tab" title="Beskeder"/> - <accordion_tab name="group_land_tab" title="Land/Aktiver"/> - </accordion> - <panel name="button_row"> - <button label="Lav" label_selected="Ny gruppe" name="btn_create"/> - <button label="Gem" label_selected="Gem" name="btn_apply"/> + <panel name="group_info_top"> + <text name="group_name" value="(Henter...)"/> + <line_editor label="Indtast nyt gruppenavn her" name="group_name_editor"/> </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="Generelt"/> + <accordion_tab name="group_roles_tab" title="Roller"/> + <accordion_tab name="group_notices_tab" title="Noter"/> + <accordion_tab name="group_land_tab" title="Land/Aktiver"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="Chat" name="btn_chat"/> + <button label="Gruppeopkald" name="btn_call" tool_tip="Opkald til denne gruppe"/> + <button label="Gem" label_selected="Save" name="btn_apply"/> + <button label="Opret gruppe" name="btn_create" tool_tip="Opret en ny gruppe"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml index 1e00642c29..49daf6c9f2 100644 --- a/indra/newview/skins/default/xui/da/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml @@ -7,17 +7,14 @@ (indlæser...) </panel.string> <panel.string name="already_in_group"> - Nogen af avatarerne var allerede i gruppen og blev ikke inviteret + Nogle af de beboere du vælger er allerede i gruppen, så de får ikke tilsendt en invitation. </panel.string> <text name="help_text"> - Du kan invitere flere beboere ad -gangen til at blive medlem af din -gruppe. Klik 'Åben personvælger' for -at begynde. + Du kan invitere flere beboere ad gangen til at blive medlem af din gruppe. Klik 'Åben personvælger' for at begynde. </text> <button bottom_delta="-30" label="Åben personvælger" name="add_button"/> - <name_list name="invitee_list" tool_tip="Hold Ctrl knappen nede og klik på beboer navne for at vælge flere"/> - <button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjern beboere valgt ovenfor fra invitationslisten"/> + <name_list name="invitee_list" tool_tip="Hold Ctrl-tasten nede og klik på beboere for at vælge flere."/> + <button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjerner beboere, der er valgt på ovenstående invitationsliste."/> <text name="role_text"> Vælg hvilken rolle, du vil tildele dem: </text> diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml index c73d7c807d..9b0267529c 100644 --- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml @@ -1,65 +1,62 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Land & L$" name="land_money_tab"> - <string name="help_text"> + <panel.string name="help_text"> En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> + </panel.string> + <panel.string name="cant_view_group_land_text"> Du har ikke tilladelse til at se gruppeejet land. - </string> - <string name="cant_view_group_accounting_text"> + </panel.string> + <panel.string name="cant_view_group_accounting_text"> Du har ikke tilladelse til at se gruppens økonomiinformationer. - </string> - <string name="loading_txt"> + </panel.string> + <panel.string name="loading_txt"> Indlæser... - </string> - <text name="group_land_heading"> - Gruppeejet land - </text> - <scroll_list name="group_parcel_list"> - <column label="Parcel" name="name"/> - <column label="Region" name="location"/> - <column label="Type" name="type"/> - <column label="Område" name="area"/> - <column label="" name="hidden"/> - </scroll_list> - <button label="Kort" label_selected="Kort" name="map_button"/> - <text name="total_contributed_land_label"> - Totalt bidrag: - </text> - <text name="total_contributed_land_value"> - [AREA] m² - </text> - <text name="total_land_in_use_label"> - Totalt land i brug: - </text> - <text name="total_land_in_use_value"> - [AREA] m² - </text> - <text name="land_available_label"> - Ledigt land: - </text> - <text name="land_available_value"> - [AREA] m² - </text> - <text name="your_contribution_label"> - Dit bidrag: - </text> - <string name="land_contrib_error"> + </panel.string> + <panel.string name="land_contrib_error"> Ikke muligt at lave dit bidrag til landet - </string> - <text name="your_contribution_units"> - m² - </text> - <text name="your_contribution_max_value"> - ([AMOUNT] maks.) - </text> - <text name="group_over_limit_text"> - Gruppemedlemmer må bidrag med mere, for at understøtte med det land der bliver brugt - </text> - <text name="group_money_heading"> - Gruppe L$ - </text> + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="Parcel" name="name"/> + <scroll_list.columns label="Region" name="location"/> + <scroll_list.columns label="Type" name="type"/> + <scroll_list.columns label="Areal" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + Totalt bidrag: + </text> + <text name="total_contributed_land_value"> + [AREA] m² + </text> + <button label="Kort" label_selected="Kort" name="map_button"/> + <text name="total_land_in_use_label"> + Totalt land i brug: + </text> + <text name="total_land_in_use_value"> + [AREA] m² + </text> + <text name="land_available_label"> + Land tilgængelgt: + </text> + <text name="land_available_value"> + [AREA] m² + </text> + <text name="your_contribution_label"> + Dit bidrag: + </text> + <text name="your_contribution_units"> + m² + </text> + <text name="your_contribution_max_value"> + ([BELØB] maks.) + </text> + <text name="group_over_limit_text"> + Der kræves flere penge for at supportere det land der er i brug + </text> + <text name="group_money_heading"> + Gruppe L$ + </text> + </panel> <tab_container name="group_money_tab_container"> <panel label="PLANLÆGNING" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml index bfffdccc5e..e77e548340 100644 --- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Ukendt"/> + <button name="profile_btn" tool_tip="Se profil"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml index ec503c37dc..7046ac4d7c 100644 --- a/indra/newview/skins/default/xui/da/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml @@ -42,7 +42,7 @@ Maksimum er 200 pr. gruppe pr. dag <text name="string"> Træk og slip en gensand for at vedhæfte den: </text> - <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment"/> + <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/> <button label="Send" label_selected="Send" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/> </panel> @@ -59,6 +59,6 @@ Maksimum er 200 pr. gruppe pr. dag <text name="lbl4"> Besked: </text> - <button label="Åben bilag" label_selected="åben bilag" name="open_attachment"/> + <button label="Åben vedhæng" label_selected="åben bilag" name="open_attachment"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml index 43a84298e2..8a684ca031 100644 --- a/indra/newview/skins/default/xui/da/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml @@ -4,5 +4,5 @@ <text name="title" value="Afsender navn / Gruppe navn"/> </panel> <text name="attachment" value="Bilag"/> - <button label="Ok" name="btn_ok"/> + <button label="OK" name="btn_ok"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml index 74bea831fb..3ab3dd8bf8 100644 --- a/indra/newview/skins/default/xui/da/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Medlemmer & roller" name="roles_tab"> <panel.string name="default_needs_apply_text"> - Der er ændringer her, der ikke er gemt. + Der er ændringer som ikke er gemt </panel.string> <panel.string name="want_apply_text"> Vil du gemme disse ændringer? @@ -58,7 +58,7 @@ ting i denne gruppe. Der er en bred vifte af rettigheder. </tab_container> <panel name="members_footer"> <text name="static"> - Medlemmer + Tildelte roller </text> <scroll_list name="member_assigned_roles"> <scroll_list.columns label="" name="checkbox"/> diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml index 0384652e5d..1ba6b8b97f 100644 --- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml @@ -1,13 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <text name="avatar_name" value="Ukendt"/> - <button label="Profil" name="view_profile_btn"/> - <button label="Tilføj ven" name="add_friend_btn"/> - <button label="Teleportér" name="teleport_btn"/> - <button label="Del" name="share_btn"/> - <panel name="panel_call_buttons"> - <button label="Opkald" name="call_btn"/> - <button label="Læg på" name="end_call_btn"/> - <button label="Stemme opsætning" name="voice_ctrls_btn"/> - </panel> + <layout_stack name="button_stack"> + <layout_panel name="view_profile_btn_panel"> + <button label="Profil" name="view_profile_btn"/> + </layout_panel> + <layout_panel name="add_friend_btn_panel"> + <button label="Tilføj ven" name="add_friend_btn"/> + </layout_panel> + <layout_panel name="teleport_btn_panel"> + <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport til denne person"/> + </layout_panel> + <layout_panel name="share_btn_panel"> + <button label="Del" name="share_btn"/> + </layout_panel> + <layout_panel name="share_btn_panel"> + <button label="Betal" name="pay_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Opkald" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Forlad opkald" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Stemme kontroller" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml index 202a4d4664..8503a41763 100644 --- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml @@ -18,6 +18,7 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <button name="back_btn" tool_tip="Tilbage"/> <text name="title" value="Sted profil"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml index 47487832cb..8adce2c819 100644 --- a/indra/newview/skins/default/xui/da/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="Favorites bjælke"/> - <accordion_tab name="tab_landmarks" title="Landemærker"/> + <accordion_tab name="tab_landmarks" title="Mine landmærker"/> <accordion_tab name="tab_inventory" title="Min beholdning"/> <accordion_tab name="tab_library" title="Bibliotek"/> </accordion> diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index c8c275d84d..9276ff3a09 100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml @@ -13,7 +13,7 @@ </text> <line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> <line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> - <check_box label="Husk" name="remember_check"/> + <check_box label="Husk password" name="remember_check"/> <text name="start_location_text"> Start ved: </text> diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml index 2cfd358d13..f98ced5f91 100644 --- a/indra/newview/skins/default/xui/da/panel_me.xml +++ b/indra/newview/skins/default/xui/da/panel_me.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Min profil" name="panel_me"> <tab_container name="tabs"> - <panel label="PROFIL" name="panel_profile"/> - <panel label="FAVORITTER" name="panel_picks"/> + <panel label="MIN PROFIL" name="panel_profile"/> + <panel label="MINE FAVORITTER" name="panel_picks"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml index 7f1581888d..48f08b9dfd 100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml @@ -4,16 +4,16 @@ Hjemmeside: </text> <text name="home_fails_whitelist_label"> - (Denne side optræder ikke i godkendte sider) + (Siden er ikke på listen med godkendte sider) </text> - <line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette media"/> + <line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette medie"/> <text name="preview_label"> Vis </text> <text name="current_url_label"> Nuværende side: </text> - <text name="current_url" tool_tip="Den nuværende hjemmeside for kilden til dette media" value=""/> + <text name="current_url" tool_tip="Nuværende side for kilden til dett medie" value=""/> <button label="Nulstil" name="current_url_reset_btn"/> <check_box initial_value="false" label="Gentag afspil" name="auto_loop"/> <check_box initial_value="false" label="Første klik medfører interaktion" name="first_click_interact"/> diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml index ee341f9142..278fe0eeea 100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sikkerhed" name="Media Settings Security"> - <check_box initial_value="false" label="Tillad kun adgang til specifikke URL'er (via "prefix")" name="whitelist_enable"/> + <check_box initial_value="false" label="Tillad kun adgang til angivne URL mønstre" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - Opslag som hjemmesiden fejler ved er markeret: + Angivelser som hjemmesiden fejler imod er markeret: </text> <button label="Tilføj" name="whitelist_add"/> <button label="Slet" name="whitelist_del"/> <text name="home_url_fails_whitelist"> - Advarsel: Hjemmesiden angive i "Generelt" fanen er ikke indeholdt i godkendte sider. Den er slået fra, indtil en gyldig værdi er tilføjet. + Advarsel: hjemmesiden specificeret i Generelt fanen opfylder ikke krav på listen med godkendte URL. Den er de-aktiveret indtil en gyldig hjemmeside er tilføjet. </text> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_my_profile.xml b/indra/newview/skins/default/xui/da/panel_my_profile.xml index 1dffc73239..7eb3c9f4e5 100644 --- a/indra/newview/skins/default/xui/da/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_my_profile.xml @@ -1,37 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Profil" name="panel_profile"> <string name="no_partner_text" value="Ingen"/> + <string name="no_group_text" value="Ingen"/> <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> - <scroll_container name="profile_scroll"> - <panel name="scroll_content_panel"> - <panel name="second_life_image_panel"> - <icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/> - </panel> - <panel name="first_life_image_panel"> - <icon label="" name="real_world_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/> - <text name="title_rw_descr_text" value="RL:"/> - </panel> - <text name="me_homepage_text"> - Web: - </text> - <text name="title_member_text" value="Medlem siden:"/> - <text name="title_acc_status_text" value="Konto:"/> - <text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/> - <text name="title_partner_text" value="Partner:"/> - <text name="title_groups_text" value="Grupper:"/> - </panel> - </scroll_container> - <panel name="profile_buttons_panel"> - <button label="Tilføj ven" name="add_friend"/> - <button label="IM" name="im"/> - <button label="Opkald" name="call"/> - <button label="Kort" name="show_on_map_btn"/> - <button label="Teleportér" name="teleport"/> - </panel> - <panel name="profile_me_buttons_panel"> - <button label="Rediger profil" name="edit_profile_btn" tool_tip="Redigér personlig information"/> - <button label="Ændre udseende" name="edit_appearance_btn" tool_tip="Ændre dit udseende: fysiske data, tøj m.v."/> - </panel> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="second_life_image_panel"> + <icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <icon label="" name="real_world_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/> + <text name="title_rw_descr_text" value="Real World:"/> + </panel> + <text name="title_member_text" value="Beboer siden:"/> + <text name="title_acc_status_text" value="Konto status:"/> + <text name="title_partner_text" value="Partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(henter)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupper:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/> + <button label="Rediger udseende" name="edit_appearance_btn" tool_tip="Opret/tilret dit udseende: fysiske data, tøj m.v."/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml index 465bc75a1b..79f7e81b35 100644 --- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> <panel name="navigation_panel"> - <button name="back_btn" tool_tip="Gå tilbage til min forrige lokation"/> - <button name="forward_btn" tool_tip="Gå en lokation fremad"/> + <pull_button name="back_btn" tool_tip="Gå tilbage til min forrige lokation"/> + <pull_button name="forward_btn" tool_tip="Gå en lokation fremad"/> <button name="home_btn" tool_tip="Teleport til min hjemme lokation"/> <location_input label="Lokation" name="location_combo"/> <search_combo_box label="Søg" name="search_combo_box" tool_tip="Søg"> <combo_editor label="Søg [SECOND_LIFE]" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite"> + <favorites_bar name="favorite" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!"> + <label name="favorites_bar_label" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!"> + Favorit bar + </label> <chevron_button name=">>" tool_tip="Søg mere af mine favoritter"/> </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml new file mode 100644 index 0000000000..32905a2deb --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <tom> + </string> + <string name="parcel_media_name"> + Streaming Media dette sted + </string> + <string name="parcel_audio_name"> + Streaming Audio dette sted + </string> + <string name="playing_suffix"> + (afspilles) + </string> + <panel name="minimized_controls"> + <button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt på"/> + <button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt på"/> + <button name="open_prefs_btn" tool_tip="Vis media preferencer"/> + <button label="Mere >>" label_selected="Mindre <<" name="more_less_btn" tool_tip="Avanceret opsætning"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Overalt" name="All"/> + <combo_box.item label="På dette sted" name="WithinParcel"/> + <combo_box.item label="Udenfor dette sted" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="I nærheden" name="media_proximity"/> + <scroll_list.columns label="Synligt" name="media_visibility"/> + <scroll_list.columns label="Klasse" name="media_class"/> + <scroll_list.columns label="Navn" name="media_name"/> + <scroll_list.columns label="Debug" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Stop valgte medie"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Afspil valgte medie"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pause valgte medie"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_notes.xml b/indra/newview/skins/default/xui/da/panel_notes.xml index f8d911b9e5..5b3a2d0906 100644 --- a/indra/newview/skins/default/xui/da/panel_notes.xml +++ b/indra/newview/skins/default/xui/da/panel_notes.xml @@ -13,10 +13,10 @@ </scroll_container> </panel> <panel name="notes_buttons_panel"> - <button label="Tilføj" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/> + <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboer"/> <button label="IM" name="im" tool_tip="Åben session med personlig besked (IM)"/> <button label="Kald" name="call" tool_tip="Opkald til denne beboer"/> - <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren på kortet"/> + <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboer på kort"/> <button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/> </panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/da/panel_online_status.xml b/indra/newview/skins/default/xui/da/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml index 7d6401283e..df00cfb2eb 100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <accordion name="outfits_accordion"> - <accordion_tab name="tab_cof" title="Nuværende sæt"/> - <accordion_tab name="tab_outfits" title="Mine sæt"/> - </accordion> +<panel label="Ting" name="Outfits"> + <tab_container name="appearance_tabs"> + <inventory_panel label="MINE SÆT" name="outfitslist_tab"/> + <inventory_panel label="HAR PÅ" name="cof_tab"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Vis flere muligheder"/> + <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/> + <button label="Gem sæt" name="make_outfit_btn" tool_tip="Gem udseende som nyt sæt"/> + <button label="Tag på" name="wear_btn" tool_tip="Tag valgte sæt på"/> + <button label="M" name="look_edit_btn"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml index a6a796f612..7b6469023b 100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml @@ -4,6 +4,6 @@ <menu_item_call label="Tilføj til nuværende sæt" name="add"/> <menu_item_call label="Fjern fra nuværende sæt" name="remove"/> <menu_item_call label="Omdøb" name="rename"/> - <menu_item_call label="Fjern" name="remove_link"/> - <menu_item_call label="Slet" name="delete"/> + <menu_item_call label="Fjern link" name="remove_link"/> + <menu_item_call label="Slet sæt" name="delete"/> </menu> diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index 07b7f60810..ecfac67b1a 100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml @@ -5,7 +5,6 @@ <string name="no_one_near" value="Ingen tæt på"/> <string name="no_friends_online" value="Ingen venner online"/> <string name="no_friends" value="Ingen venner"/> - <string name="no_groups" value="Ingen grupper"/> <string name="people_filter_label" value="Filtrér personer"/> <string name="groups_filter_label" value="Filtrér grupper"/> <filter_editor label="Filtrér" name="filter_input"/> @@ -13,21 +12,25 @@ <panel label="TÆT PÅ" name="nearby_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="nearby_view_sort_btn" tool_tip="Valg"/> - <button name="add_friend_btn" tool_tip="Tilføjer valgte beboere til din venneliste"/> + <button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/> </panel> </panel> - <panel label="VENNER" name="friends_panel"> + <panel label="MINE VENNER" name="friends_panel"> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Alle"/> </accordion> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Valg"/> - <button name="add_btn" tool_tip="Tilbyd venskab til beboer"/> + <button name="add_btn" tool_tip="Tilbyd venskab til en beboer"/> <button name="del_btn" tool_tip="Fjern valgte person fra din venneliste"/> </panel> + <text name="no_friends_msg"> + For at tilføje venner prøv [secondlife:///app/search/people global search] eller klik på en bruger for at tilføje dem som ven. +Hvis du leder efter beboere at være sammen med, [secondlife:///app/worldmap prøv kortet]. + </text> </panel> - <panel label="GRUPPER" name="groups_panel"> + <panel label="MINE GRUPPER" name="groups_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="groups_viewsort_btn" tool_tip="Valg"/> <button name="plus_btn" tool_tip="Bliv medlem af gruppe/Opret ny gruppe"/> @@ -37,17 +40,18 @@ <panel label="NYLIGE" name="recent_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="recent_viewsort_btn" tool_tip="Valg"/> - <button name="add_friend_btn" tool_tip="Tilføj valgte person til din venneliste"/> + <button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/> </panel> </panel> </tab_container> <panel name="button_bar"> - <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, grupper og anden information om beboer"/> + <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/> <button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/> <button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/> <button label="Del" name="share_btn"/> <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/> <button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/> <button label="Gruppe chat" name="chat_btn" tool_tip="Åben chat session"/> + <button label="Gruppe opkald" name="group_call_btn" tool_tip="Opkald til denne gruppe"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml index 24316fea14..c1ed95f580 100644 --- a/indra/newview/skins/default/xui/da/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml @@ -6,7 +6,7 @@ <string name="available" value="ledig"/> <string name="allocated" value="fordelt"/> <string name="title_place" value="Sted profil"/> - <string name="title_teleport_history" value="Teleport historik sted"/> + <string name="title_teleport_history" value="Teleport historik"/> <string name="not_available" value="(N\A)"/> <string name="unknown" value="(ukendt)"/> <string name="public" value="(offentlig)"/> @@ -41,62 +41,17 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <button name="back_btn" tool_tip="Tilbage"/> <text name="title" value="Sted profil"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> <text name="owner_label" value="Ejer:"/> <text name="maturity_value" value="ukendt"/> <accordion name="advanced_info_accordion"> - <accordion_tab name="parcel_characteristics_tab" title="Parcel"> - <panel> - <text name="rating_label" value="Rating:"/> - <text name="rating_value" value="ukendt"/> - <text name="voice_label" value="Stem:"/> - <text name="voice_value" value="Til"/> - <text name="fly_label" value="Flyve:"/> - <text name="fly_value" value="Til"/> - <text name="push_label" value="Skub:"/> - <text name="push_value" value="Fra"/> - <text name="build_label" value="Byg:"/> - <text name="build_value" value="Til"/> - <text name="scripts_label" value="Scripts:"/> - <text name="scripts_value" value="Til"/> - <text name="damage_label" value="Skade:"/> - <text name="damage_value" value="Fra"/> - <button label="Om land" name="about_land_btn"/> - </panel> - </accordion_tab> - <accordion_tab name="region_information_tab" title="Region"> - <panel> - <text name="region_name_label" value="Region:"/> - <text name="region_type_label" value="Type:"/> - <text name="region_rating_label" value="Rating:"/> - <text name="region_owner_label" value="Ejer:"/> - <text name="region_group_label" value="Gruppe:"/> - <button label="Region/Estate" name="region_info_btn"/> - </panel> - </accordion_tab> - <accordion_tab name="estate_information_tab" title="Estate"> - <panel> - <text name="estate_name_label" value="Estate:"/> - <text name="estate_rating_label" value="Rating:"/> - <text name="estate_owner_label" value="Ejer:"/> - <text name="covenant_label" value="Regler:"/> - </panel> - </accordion_tab> - <accordion_tab name="sales_tab" title="Til salg"> - <panel> - <text name="sales_price_label" value="Pris:"/> - <text name="area_label" value="Areal:"/> - <text name="traffic_label" value="Trafik:"/> - <text name="primitives_label" value="Prims:"/> - <text name="parcel_scripts_label" value="Scripts:"/> - <text name="terraform_limits_label" value="Terraform begrænsninger:"/> - <text name="subdivide_label" value="Mulighed for at Opdele/samle:"/> - <text name="resale_label" value="Mulighed for videresalg:"/> - <text name="sale_to_label" value="Til salg til:"/> - </panel> - </accordion_tab> + <accordion_tab name="parcel_characteristics_tab" title="Parcel"/> + <accordion_tab name="region_information_tab" title="Region"/> + <accordion_tab name="estate_information_tab" title="Estate"/> + <accordion_tab name="sales_tab" title="Til salg"/> </accordion> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index 052bf749cb..3ac4ebaae9 100644 --- a/indra/newview/skins/default/xui/da/panel_places.xml +++ b/indra/newview/skins/default/xui/da/panel_places.xml @@ -2,13 +2,14 @@ <panel label="Steder" name="places panel"> <string name="landmarks_tab_title" value="MINE LANDEMÆRKER"/> <string name="teleport_history_tab_title" value="TELEPORT HISTORIK"/> - <filter_editor label="Filtrér steder" name="Filter"/> + <filter_editor label="Filtrér mine steder" name="Filter"/> <panel name="button_panel"> - <button label="Teleportér" name="teleport_btn"/> + <button label="Teleportér" name="teleport_btn" tool_tip="Teleportér til det valgte område"/> <button label="Kort" name="map_btn"/> - <button label="Redigér" name="edit_btn"/> - <button label="Luk" name="close_btn"/> - <button label="Annullér" name="cancel_btn"/> + <button label="Redigér" name="edit_btn" tool_tip="Redigér landemærke information"/> + <button label="▼" name="overflow_btn" tool_tip="Vise flere valgmuligheder"/> <button label="Gem" name="save_btn"/> + <button label="Annullér" name="cancel_btn"/> + <button label="Luk" name="close_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 87b749b4eb..30665dfa0e 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -1,27 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> +<panel label="Avanceret" name="advanced"> <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="Talebobler" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="Vælg farve for talebobler"/> - <slider label="Gennemsigtighed" name="bubble_chat_opacity"/> - <text name="AspectRatioLabel1" tool_tip="bredde / højde"> - Format - </text> - <combo_box name="aspect_ratio" tool_tip="bredde/ højde"> - <combo_box.item label="4:3 (Standard CRT)" name="item1"/> - <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> - <combo_box.item label="8:5 (Widescreen)" name="item3"/> - <combo_box.item label="16:9 (Widescreen)" name="item4"/> - </combo_box> - <check_box label="Registrér automatisk" name="aspect_auto_detect"/> - <text name="heading1"> - Kamera: - </text> <slider label="Synsvinkel" name="camera_fov"/> <slider label="Distance" name="camera_offset_scale"/> <text name="heading2"> @@ -29,20 +10,20 @@ </text> <check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/> <check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/> - <text name="heading3"> - Avatarer: - </text> <check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/> <check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/> <check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/> <check_box label="Bevæg avatarlæber når der tales" name="enable_lip_sync"/> - <check_box label="Vis scriptfejl" name="show_script_errors"/> + <check_box label="Talebobler" name="bubble_text_chat"/> + <slider label="Gennemsigtighed" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Vælg farve for talebobler"/> + <check_box label="Vis script fejl i:" name="show_script_errors"/> <radio_group name="show_location"> - <radio_item label="I chat" name="0"/> - <radio_item label="I et vindue" name="1"/> + <radio_item label="Chat" name="0"/> + <radio_item label="Separat vindue" name="1"/> </radio_group> - <check_box label="Knap til aktivering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/> + <check_box label="Knap til aktiverering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/> <line_editor label="Brug walkie-talkie modus" name="modifier_combo"/> <button label="Angiv taste" name="set_voice_hotkey_button"/> - <button label="Midterste museknap" name="set_voice_middlemouse_button"/> + <button label="Midterste museknap" name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste musetaste"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml index 4791033757..7caa17d514 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml @@ -4,11 +4,11 @@ Vis mig når: </text> <check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/> - <check_box label="Når mine venner logger af eller på" name="friends_online_notify_checkbox"/> + <check_box label="Når mine venner logger på eller af" name="friends_online_notify_checkbox"/> <text name="show_label"> - Vis altid disse beskeder: + Vis altid: </text> <text name="dont_show_label"> - Vis aldrig disse beskeder: + Vis aldrig: </text> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 609512bc1b..3345bceff7 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Tekst chat" name="chat"> <radio_group name="chat_font_size"> - <radio_item label="Lille" name="radio"/> - <radio_item label="Mellem" name="radio2"/> - <radio_item label="Stor" name="radio3"/> + <radio_item label="Lille" name="radio" value="0"/> + <radio_item label="Mellem" name="radio2" value="1"/> + <radio_item label="Stor" name="radio3" value="2"/> </radio_group> <color_swatch label="Dig" name="user"/> <text name="text_box1"> @@ -39,8 +39,8 @@ </text> <check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/> <check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/> - <radio_group name="chat_window" tool_tip="Vis dine personlige beskeder i separate vinduer eller i ét vindue med mange faner (ændring kræver genstart)"> - <radio_item label="Flere vinduer" name="radio"/> - <radio_item label="Et vindue" name="radio2"/> + <radio_group name="chat_window" tool_tip="Vise dine personlige beskeder i separate vinduer, eller i ét vindue med flere faner (Kræver genstart)"> + <radio_item label="Separate vinduer" name="radio" value="0"/> + <radio_item label="Faner" name="radio2" value="1"/> </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index e17ccca4a1..f2c59f3d81 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -38,9 +38,9 @@ Navneskilte: </text> <radio_group name="Name_Tag_Preference"> - <radio_item label="Skjul" name="radio"/> - <radio_item label="Vis" name="radio2"/> - <radio_item label="Vis et øjeblik" name="radio3"/> + <radio_item label="Skjul" name="radio" value="0"/> + <radio_item label="Vis" name="radio2" value="1"/> + <radio_item label="Vis et øjeblik" name="radio3" value="2"/> </radio_group> <check_box label="Vis mit navn" name="show_my_name_checkbox1"/> <check_box initial_value="true" label="Små avatar navne" name="small_avatar_names_checkbox"/> @@ -48,14 +48,17 @@ <text name="effects_color_textbox"> Farve til mine effekter: </text> - <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/> <text name="title_afk_text"> Tid inden "væk": </text> - <spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/> - <text name="seconds_textbox"> - sekunder - </text> + <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/> + <combo_box label="Timeout før 'væk':" name="afk"> + <combo_box.item label="2 minutter" name="item0"/> + <combo_box.item label="5 minutter" name="item1"/> + <combo_box.item label="10 minutter" name="item2"/> + <combo_box.item label="30 minutter" name="item3"/> + <combo_box.item label="aldrig" name="item4"/> + </combo_box> <text name="text_box3"> Optaget autosvar: </text> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index bb1cacc773..07e3aec72a 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -88,8 +88,8 @@ Lys detaljer: </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Kun sol og måne" name="SunMoon"/> - <radio_item label="Lys i nærheden" name="LocalLights"/> + <radio_item label="Kun sol og måne" name="SunMoon" value="0"/> + <radio_item label="Lys i nærheden" name="LocalLights" value="1"/> </radio_group> <text name="TerrainDetailText"> Terræn detaljer: diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml index c382b222ea..cdb407dbad 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> log på for at ændre </panel.string> - <button label="Nulstil historik" name="clear_cache"/> + <button label="Nulstil historik" name="clear_cache" tool_tip="Fjern login billede, sidste lokation, teleport historik, samt web og tekstur cache"/> <text name="cache_size_label_l"> (Lokationer, billeder, web, søge historik) </text> @@ -11,7 +11,6 @@ <check_box label="Kun venner og grupper kan sende besked til mig" name="voice_call_friends_only_check"/> <check_box label="Slå mikrofon fra når opkald slutter" name="auto_disengage_mic_check"/> <check_box label="Acceptér cookies" name="cookies_enabled"/> - <check_box label="Tillad media autoplay" name="autoplay_enabled"/> <text name="Logs:"> Logs: </text> @@ -19,7 +18,7 @@ <check_box label="Gem en log med private beskeder (IM) på min computer" name="log_instant_messages"/> <check_box label="Tilføj tidsstempel" name="show_timestamps_check_im"/> <text name="log_path_desc"> - Placering af logfiler + Placering af logfiler: </text> <button label="Ændre sti" label_selected="Ændre sti" left="150" name="log_path_button"/> <button label="Liste med blokeringer" name="block_list"/> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 2dd0b71d8f..279e288096 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Input og kamera" name="Input panel"> +<panel label="Opsætning" name="Input panel"> <button label="Andre enheder" name="joystick_setup_button"/> <text name="Mouselook:"> Første person: @@ -18,29 +18,29 @@ kbps </text> <check_box label="Speciel port" name="connection_port_enabled"/> - <spinner label="Port nummer:" name="web_proxy_port"/> + <spinner label="Port nummer:" name="connection_port"/> <text name="cache_size_label_l"> Cache størrelse </text> <text name="text_box5"> MB </text> - <button label="Vælg" label_selected="Vælg" name="set_cache"/> - <button label="Nulstil" label_selected="Gem" name="reset_cache"/> <text name="Cache location"> - Cache lokation + Cache placering: </text> + <button label="Vælg" label_selected="Vælg" name="set_cache"/> + <button label="Nulstil" label_selected="Nulstil" name="reset_cache"/> <text name="Web:"> Web: </text> <radio_group name="use_external_browser"> - <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]."/> - <radio_item label="Brug min normale browser (IE, Firefox)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm."/> + <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value="0"/> + <radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/> </radio_group> - <check_box initial_value="false" label="Web proxy" name="web_proxy_enabled"/> - <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/> - <button label="Vælg" label_selected="Vælg" name="set_proxy"/> + <check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/> <text name="Proxy location"> - Proxy placering + Proxy placering: </text> + <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/> + <spinner label="Port nummer:" name="web_proxy_port"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml index ce77018f72..856f978ebd 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml @@ -1,14 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Lyde" name="Preference Media panel"> <slider label="Generel" name="System Volume"/> - <check_box initial_value="true" label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized"/> - <slider label="Omgivelser" name="Wind Volume"/> + <check_box initial_value="true" label="Sluk lyd når minimeret" name="mute_when_minimized"/> <slider label="Knapper" name="UI Volume"/> - <slider label="Media" name="Media Volume"/> - <slider label="Effekter" name="SFX Volume"/> + <slider label="Omgivelser" name="Wind Volume"/> + <slider label="Lyd effekter" name="SFX Volume"/> <slider label="Musik" name="Music Volume"/> - <check_box label="Tale" name="enable_voice_check"/> - <slider label="Tale" name="Voice Volume"/> + <check_box label="Aktiveret" name="music_enabled"/> + <slider label="Media" name="Media Volume"/> + <check_box label="Aktiveret" name="enable_media"/> + <slider label="Stemme chat" name="Voice Volume"/> + <check_box label="Aktiveret" name="enable_voice_check"/> + <check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="sandt"/> + <check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="sandt"/> + <text name="voice_chat_settings"> + Stemme chat opsætning + </text> <text name="Listen from"> Hør stemmer fra: </text> diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml index 987ba2a3f8..d3b3c7e21e 100644 --- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml @@ -1,6 +1,47 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="MediaControls"> + <string name="min_width"> + 300 + </string> + <string name="min_height"> + 75 + </string> + <string name="zoom_medium_padding"> + 1.1 + </string> + <string name="top_world_view_avoid_zone"> + 50 + </string> + <layout_stack name="progress_indicator_area"> + <panel name="media_progress_indicator"> + <progress_bar name="media_progress_bar" tool_tip="Medie hentes"/> + </panel> + </layout_stack> <layout_stack name="media_controls"> + <layout_panel name="back"> + <button name="back_btn" tool_tip="Navigér tilbage"/> + </layout_panel> + <layout_panel name="fwd"> + <button name="fwd_btn" tool_tip="Navigér frem"/> + </layout_panel> + <layout_panel name="home"> + <button name="home_btn" tool_tip="Hjemmeside"/> + </layout_panel> + <layout_panel name="media_stop"> + <button name="media_stop_btn" tool_tip="Stop medie"/> + </layout_panel> + <layout_panel name="reload"> + <button name="reload_btn" tool_tip="Indlæs igen"/> + </layout_panel> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Stop indlæsning"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Afspil medie"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pause medie"/> + </layout_panel> <layout_panel name="media_address"> <line_editor name="media_address_url" tool_tip="Media URL"/> <layout_stack name="media_address_url_icons"> @@ -15,14 +56,24 @@ <layout_panel name="media_play_position"> <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Filmafspilning fremskridt"/> </layout_panel> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Gå tilbage"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Gå frem"/> + </layout_panel> <layout_panel name="media_volume"> <button name="media_mute_button" tool_tip="Sluk for dette media"/> <slider name="volume_slider" tool_tip="Media lydstyrke"/> </layout_panel> - </layout_stack> - <layout_stack> - <panel name="media_progress_indicator"> - <progress_bar name="media_progress_bar" tool_tip="Media hentes"/> - </panel> + <layout_panel name="zoom_frame"> + <button name="zoom_frame_btn" tool_tip="Zoom til medie"/> + </layout_panel> + <layout_panel name="close"> + <button name="close_btn" tool_tip="Zoom tilbage"/> + </layout_panel> + <layout_panel name="new_window"> + <button name="new_window_btn" tool_tip="Åben URL i browser"/> + </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_profile.xml b/indra/newview/skins/default/xui/da/panel_profile.xml index ef7110ffcf..c5bfc3ae80 100644 --- a/indra/newview/skins/default/xui/da/panel_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_profile.xml @@ -1,37 +1,41 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Profil" name="panel_profile"> <string name="no_partner_text" value="Ingen"/> + <string name="no_group_text" value="Ingen"/> <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> - <scroll_container name="profile_scroll"> - <panel name="scroll_content_panel"> - <panel name="second_life_image_panel"> - <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> - </panel> - <panel name="first_life_image_panel"> - <text name="title_rw_descr_text" value="Real world:"/> - </panel> - <text name="me_homepage_text"> - Hjemmeside: - </text> - <text name="title_member_text" value="Medlem siden:"/> - <text name="title_acc_status_text" value="Konto status:"/> - <text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/> - <text name="title_partner_text" value="Partner:"/> - <text name="title_groups_text" value="Grupper:"/> - </panel> - </scroll_container> - <panel name="profile_buttons_panel"> - <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til denne beboer"/> - <button label="IM" name="im" tool_tip="Skriv en personlig besked (IM)"/> - <button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/> - <button label="Map" name="show_on_map_btn" tool_tip="Show the resident on the map"/> - <button label="Tilbyd teleport" name="teleport" tool_tip="Tilbyd en teleport til denne beboer"/> - <button label="▼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med denne beboer"/> - </panel> - <panel name="profile_me_buttons_panel"> - <button label="Redigér profil" name="edit_profile_btn"/> - <button label="Redigér udseende" name="edit_appearance_btn"/> - </panel> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="profile_scroll_panel"> + <panel name="second_life_image_panel"> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <text name="title_rw_descr_text" value="Real World:"/> + </panel> + <text name="title_member_text" value="Beboer siden:"/> + <text name="title_acc_status_text" value="Konto status:"/> + <text name="title_partner_text" value="Partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(henter)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupper:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_buttons_panel"> + <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/> + <button label="IM" name="im" tool_tip="Åben session med personlige beskeder (IM)"/> + <button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/> + <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren på kortet"/> + <button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/> + <button label="▼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med beboeren"/> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/> + <button label="Redigér udseende" name="edit_appearance_btn" tool_tip="Opret/redigér dit udseende: fysiske data, tøj m.v."/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml index 0e8ab7556f..564d8e6665 100644 --- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml @@ -27,7 +27,7 @@ Ændringer i regler vil blive vist i alle parceller til denne estate. </text> <text name="covenant_instructions"> - Træk og slip en note for at ændre regler for denne estate. + Træk og slip et notecard her for at ændre regler for denne estate. </text> <text name="region_section_lbl"> Region diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index d726fedfe9..c21fd9db37 100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Estate" name="Estate"> <text name="estate_help_text"> - Ændringer i dette afsnit vil påvirke alle -regioner i dette estate. + Ændringer her vil påvirke alle regioner i dette estate. </text> <text name="estate_text"> Estate: @@ -24,10 +23,10 @@ regioner i dette estate. <check_box label="Tillad offentlig adgang" name="externally_visible_check"/> <button label="?" name="externally_visible_help"/> <text name="Only Allow"> - Begræns adgang til: + Begræns adgang til konti bekræftet med: </text> - <check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for brugere uden identifikation"/> - <check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for brugere der ikke har verificéret deres alder. Se [SUPPORT_SITE] for mere information."/> + <check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for uidentificerede beboere"/> + <check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er blevet aldersverificeret. Se [SUPPORT_SITE] for mere information."/> <check_box label="Tillad stemme chat" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Tillad direkte teleport" name="allow_direct_teleport"/> diff --git a/indra/newview/skins/default/xui/da/panel_region_general_layout.xml b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml new file mode 100644 index 0000000000..467684f712 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Region" name="General"> + <text name="region_text_lbl"> + Region: + </text> + <text name="region_text"> + ukendt + </text> + <text name="version_channel_text_lbl"> + Version: + </text> + <text name="version_channel_text"> + ukendt + </text> + <text name="region_type_lbl"> + Type: + </text> + <text name="region_type"> + ukendt + </text> + <check_box label="Blokér for redigering af terræn" name="block_terraform_check"/> + <check_box label="Blokér for flyvning" name="block_fly_check"/> + <check_box label="Tillad skader" name="allow_damage_check"/> + <check_box label="Begræns skubning" name="restrict_pushobject"/> + <check_box label="Tillad at sælge land" name="allow_land_resell_check"/> + <check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/> + <check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/> + <spinner label="Max besøgende" name="agent_limit_spin"/> + <spinner label="Objekt bonus" name="object_bonus_spin"/> + <text label="Rating" name="access_text"> + Rating: + </text> + <combo_box label="Moderat" name="access_combo"> + <combo_box.item label="Voksent" name="Adult"/> + <combo_box.item label="Moderat" name="Mature"/> + <combo_box.item label="Generel" name="PG"/> + </combo_box> + <button label="Gem" name="apply_btn"/> + <button label="Send en beboer hjem ..." name="kick_btn"/> + <button label="Send alle beboere hjem..."" name="kick_all_btn"/> + <button label="Send besked til region..." name="im_btn"/> + <button label="Vedligehold telehub..." name="manage_telehub_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index fc597eee15..8e324ab777 100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml @@ -45,10 +45,10 @@ <spinner label="Høj" name="height_range_spin_2"/> <spinner label="Høj" name="height_range_spin_3"/> <text name="height_text_lbl10"> - Disse værdier repræsenterer blandingsområder for teksturer ovenfor. + Disse værdier repræsenterer blandingsforhold for teksturer ovenfor. </text> <text name="height_text_lbl11"> - Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1, og HØJ værdien er minimumshøjden for tekstur 4. + Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1 og HØJ værdien er MINIMUMSshøjden for tekstur 4. </text> <text name="height_text_lbl12"> og HØJ værdien er MIMIMUM højde for texture nummer 4. diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml new file mode 100644 index 0000000000..821c82ccda --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="MIN AVATAR" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + Avatar Script forbrug + </text> + <text name="loading_text"> + Henter... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Størrelse (kb)" name="size"/> + <scroll_list.columns label="URL'er" name="urls"/> + <scroll_list.columns label="Objekt navn" name="name"/> + <scroll_list.columns label="Lokation" name="location"/> + </scroll_list> + <button label="Gentegn liste" name="refresh_list_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml new file mode 100644 index 0000000000..91fc76dbb4 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="REGION MEMORY" name="script_limits_region_memory_panel"> + <text name="script_memory"> + Parcel script memory + </text> + <text name="loading_text"> + Henter... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Størrelse (kb)" name="size"/> + <scroll_list.columns label="URL'er" name="urls"/> + <scroll_list.columns label="Objekt navn" name="name"/> + <scroll_list.columns label="Objekt ejer" name="owner"/> + <scroll_list.columns label="Parcel" name="parcel"/> + <scroll_list.columns label="Lokation" name="location"/> + </scroll_list> + <button label="Gentegn liste" name="refresh_list_btn"/> + <button label="Fremhæv" name="highlight_btn"/> + <button label="Retur" name="return_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml index ab4a2a134e..ec430d6fd4 100644 --- a/indra/newview/skins/default/xui/da/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml @@ -2,25 +2,28 @@ <!-- Side tray cannot show background because it is always partially on screen to hold tab buttons. --> <side_tray name="sidebar"> - <sidetray_tab description="Hjem." name="sidebar_home"> + <sidetray_tab description="Åbn/luk sidebar" name="sidebar_openclose" tab_title="Åbn/luk sidebar"/> + <sidetray_tab description="Hjem." name="sidebar_home" tab_title="Home"> <panel label="hjem" name="panel_home"/> </sidetray_tab> - <sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people"> + <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="My Profile"> <panel_container name="panel_container"> - <panel label="Gruppe info" name="panel_group_info_sidetray"/> + <panel label="Mig" name="panel_me"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people" tab_title="People"> + <panel_container name="panel_container"> + <panel label="Gruppe profil" name="panel_group_info_sidetray"/> <panel label="Blokerede beboere og objekter" name="panel_block_list_sidetray"/> </panel_container> </sidetray_tab> - <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places"> + <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Places"> <panel label="Steder" name="panel_places"/> </sidetray_tab> - <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me"> - <panel label="Mig" name="panel_me"/> + <sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="My Inventory"> + <panel label="Redigér beholdning" name="sidepanel_inventory"/> </sidetray_tab> - <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance"> + <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="My Appearance"> <panel label="Redigér fremtoning" name="sidepanel_appearance"/> </sidetray_tab> - <sidetray_tab description="Browse din beholdning." name="sidebar_inventory"> - <panel label="Redigér beholdning" name="sidepanel_inventory"/> - </sidetray_tab> </side_tray> diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 4e45b7e328..08ffafd5a6 100644 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml @@ -21,9 +21,11 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="My Balance: Click to buy more L$"/> + <button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/> + <button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/> <text name="TimeText" tool_tip="Nuværende tid (Pacific)"> - 12:00 + 24:00 PST </text> + <button name="media_toggle_btn" tool_tip="Start/Stop Alle medier (musik, video, hjemmesider)"/> <button name="volume_btn" tool_tip="Kontrol for generel lydstyrke"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml index 64b5ecf5cf..a1859b64d8 100644 --- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml @@ -4,6 +4,7 @@ <accordion_tab name="today" title="I dag"/> <accordion_tab name="yesterday" title="I går"/> <accordion_tab name="2_days_ago" title="2 dage siden"/> + 5 <accordion_tab name="3_days_ago" title="3 dage siden"/> <accordion_tab name="4_days_ago" title="4 dage siden"/> <accordion_tab name="5_days_ago" title="5 dage siden"/> @@ -11,4 +12,7 @@ <accordion_tab name="1_month_and_older" title="1 måned eller ældre"/> <accordion_tab name="6_months_and_older" title="6 måneder eller ældre"/> </accordion> + <panel name="bottom_panel"> + <button name="gear_btn" tool_tip="Vi flere valgmuligheder"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml new file mode 100644 index 0000000000..8148588c86 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="teleport_history_item"> + <button name="profile_btn" tool_tip="Vis info om genstand"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml index 27708f5c7a..43ddfdada7 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sæt" name="appearance panel"> <string name="No Outfit" value="Intet sæt"/> - <filter_editor label="Filtrér sæt" name="Filter"/> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Vis flere muligheder"/> - <button name="newlook_btn" tool_tip="Tilføj nyt sæt"/> - <dnd_button name="trash_btn" tool_tip="Fjern valgte del"/> - <button label="Bær" name="wear_btn"/> + <panel name="panel_currentlook"> + <text name="currentlook_title"> + (ikke gemt) + </text> </panel> + <filter_editor label="Filtrér sæt" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index 685601b922..77db828c20 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Egenskaber for beholdningsgenstand"> +<panel name="item properties" title="Objekt profil"> <panel.string name="unknown"> (ukendt) </panel.string> @@ -15,7 +15,8 @@ <panel.string name="acquiredDate"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> - <text name="title" value="Egenskaber for genstand"/> + <text name="title" value="Objekt profil"/> + <text name="where" value="(Beholdning)"/> <panel label=""> <text name="LabelItemNameTitle"> Navn: @@ -37,34 +38,36 @@ <text name="LabelAcquiredDate"> Ons Maj 24 12:50:46 2006 </text> - <text name="OwnerLabel"> - Dig: - </text> - <check_box label="Editér" name="CheckOwnerModify"/> - <check_box label="Kopiér" name="CheckOwnerCopy"/> - <check_box label="Sælg" name="CheckOwnerTransfer"/> - <text name="AnyoneLabel"> - Enhver: - </text> - <check_box label="Kopiér" name="CheckEveryoneCopy"/> - <text name="GroupLabel"> - Gruppe: - </text> - <check_box label="Del" name="CheckShareWithGroup"/> - <text name="NextOwnerLabel"> - Næste ejer: - </text> - <check_box label="Editér" name="CheckNextOwnerModify"/> - <check_box label="Kopiér" name="CheckNextOwnerCopy"/> - <check_box label="Sælg" name="CheckNextOwnerTransfer"/> + <panel name="perms_inv"> + <text name="perm_modify"> + Du kan: + </text> + <check_box label="Redigér" name="CheckOwnerModify"/> + <check_box label="Kopi" name="CheckOwnerCopy"/> + <check_box label="Giv væk" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Enhver: + </text> + <check_box label="Kopi" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Gruppe: + </text> + <check_box label="Del" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'redigere' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> + <text name="NextOwnerLabel"> + Næste ejer: + </text> + <check_box label="Redigere" name="CheckNextOwnerModify"/> + <check_box label="Kopi" name="CheckNextOwnerCopy"/> + <check_box label="Giv væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> + </panel> <check_box label="Til salg" name="CheckPurchase"/> <combo_box name="combobox sale copy"> <combo_box.item label="Kopiér" name="Copy"/> <combo_box.item label="Original" name="Original"/> </combo_box> - <spinner label="Pris:" name="Edit Cost"/> - <text name="CurrencySymbol"> - L$ - </text> + <spinner label="Pris: L$" name="Edit Cost"/> + </panel> + <panel name="button_panel"> + <button label="Annullér" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml index 6ade03ce56..add2fa3c73 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="object properties" title="Egenskaber for objekt"> +<panel name="object properties" title="Objekt profil"> <panel.string name="text deed continued"> Dedikér </panel.string> @@ -36,84 +36,61 @@ <panel.string name="Sale Mixed"> Blandet salg </panel.string> + <text name="title" value="Objekt profil"/> + <text name="where" value="(verden)"/> <panel label=""> - <text name="Name:"> - Navn: + <text name="CreatorNameLabel"> + Skaber </text> - <text name="Description:"> - Beskrivelse: + <text name="Creator Name"> + Erica Linden </text> - <text name="Creator:"> - Skaber: - </text> - <text name="Owner:"> - Ejer: - </text> - <text name="Group:"> + <text name="Group_label"> Gruppe: </text> - <button name="button set group" tool_tip="Vælg en gruppe der skal dele dette objekts rettigheder"/> - <name_box initial_value="Henter..." name="Group Name Proxy"/> - <button label="Dedikér" label_selected="Dedikér" name="button deed" tool_tip="Dedikering giver denne genstand væk med næste ejers rettigheder. Gruppedelte genstande kan dedikeres af en gruppeadministrator."/> - <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den angivne gruppe at videregive dine "redigere" rettigheder for dette objekt. Du må dedikere for at tillade rolle begrænsninger."/> - <text name="label click action"> - Klik for at: - </text> - <combo_box name="clickaction"> - <combo_box.item label="Røre (standard)" name="Touch/grab(default)"/> - <combo_box.item label="Sidde på objekt" name="Sitonobject"/> - <combo_box.item label="Købe objekt" name="Buyobject"/> - <combo_box.item label="Betale til objekt" name="Payobject"/> - <combo_box.item label="Åbne" name="Open"/> - </combo_box> - <check_box label="Til salg:" name="checkbox for sale"/> - <combo_box name="sale type"> - <combo_box.item label="Kopi" name="Copy"/> - <combo_box.item label="Indhold" name="Contents"/> - <combo_box.item label="Original" name="Original"/> - </combo_box> - <spinner label="Pris: L$" name="Edit Cost"/> - <check_box label="Vis i søgning" name="search_check" tool_tip="Lad personer se dette objekt i søgeresultater"/> - <panel name="perms_build"> + <panel name="perms_inv"> <text name="perm_modify"> Du kan redigere dette objekt </text> <text name="Anyone can:"> Enhver: </text> - <check_box label="Flytte" name="checkbox allow everyone move"/> - <check_box label="Kopiere" name="checkbox allow everyone copy"/> - <text name="Next owner can:"> + <check_box label="Kopi" name="checkbox allow everyone copy"/> + <check_box label="Flyt" name="checkbox allow everyone move"/> + <text name="GroupLabel"> + Gruppe: + </text> + <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'rediger' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> + <text name="NextOwnerLabel"> Næste ejer: </text> <check_box label="Redigere" name="checkbox next owner can modify"/> - <check_box label="Kopiere" name="checkbox next owner can copy"/> - <check_box label="Overfør" name="checkbox next owner can transfer" tool_tip="Næste ejer kan sælge eller give dette objekt væk"/> - <text name="B:"> - B: - </text> - <text name="O:"> - Å: - </text> - <text name="G:"> - O: - </text> - <text name="E:"> - R: - </text> - <text name="N:"> - N: - </text> - <text name="F:"> - F: - </text> + <check_box label="Kopi" name="checkbox next owner can copy"/> + <check_box label="Give væk" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge objekt"/> </panel> + <check_box label="Til salg" name="checkbox for sale"/> + <text name="B:"> + B: + </text> + <text name="O:"> + O: + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> </panel> <panel name="button_panel"> <button label="Åben" name="open_btn"/> <button label="Betal" name="pay_btn"/> <button label="Køb" name="buy_btn"/> - <button label="Annullér" name="cancel_btn"/> - <button label="Gem" name="save_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 493bb4cb20..412f946acc 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. - For example, the strings used in avatar chat bubbles, and strings + For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> <strings> + <string name="CAPITALIZED_APP_NAME"> + SECOND LIFE + </string> <string name="SUPPORT_SITE"> Second Life Support Portal </string> @@ -131,7 +134,7 @@ Klik for at se information om denne lokation </string> <string name="TooltipAgentUrl"> - Klik for at denne beboers profil + Klik for at se beboers profil </string> <string name="TooltipGroupUrl"> Klik for at se denne gruppes beskrivelse @@ -165,7 +168,7 @@ Vis kort for </string> <string name="BUTTON_CLOSE_DARWIN"> - Luk (⌘W) + Luk (⌘W) </string> <string name="BUTTON_CLOSE_WIN"> Luk (Ctrl+W) @@ -182,9 +185,6 @@ <string name="BUTTON_DOCK"> Fastgør </string> - <string name="BUTTON_UNDOCK"> - Frigør - </string> <string name="BUTTON_HELP"> Vis hjælp </string> @@ -209,9 +209,6 @@ <string name="AvatarNameWaiting"> (venter) </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> (ingen) </string> @@ -572,6 +569,9 @@ <string name="hang_up"> Stemme chat er afbrudt </string> + <string name="reconnect_nearby"> + Du vil nu blive dirigeret til lokal stemme chat + </string> <string name="ScriptQuestionCautionChatGranted"> '[OBJECTNAME]', en genstand, ejet af '[OWNERNAME]', lokaliseret i [REGIONNAME] på [REGIONPOS], har fået tilladelse til: [PERMISSIONS]. </string> @@ -764,9 +764,6 @@ <string name="TeleportOffer"> Teleport tilbud </string> - <string name="StartUpNotification"> - %d nye besked modtaget mens du var væk... - </string> <string name="StartUpNotifications"> %d nye beskeder modtaget mens du var væk...... </string> @@ -804,11 +801,13 @@ Tryk ESC for at skift til normalt udsyn </string> <string name="InventoryNoMatchingItems"> - No matching items found in inventory. + Ingen matchende genstande fundet i beholdning. Prøv evt. [secondlife:///app/search/groups "Search"]. + </string> + <string name="FavoritesNoMatchingItems"> + Træk et landemærke hertil for at tilføje den som favorit. </string> <string name="InventoryNoTexture"> - Du har ikke en kopi af denne -tekstur i din beholdning. + Du har ikke en kopi af denne tekstur i din beholdning </string> <string name="no_transfer" value=" (ikke overdragbar)"/> <string name="no_modify" value=" (ikke redigere)"/> @@ -1266,11 +1265,164 @@ tekstur i din beholdning. alle estates du administrerer for [OWNER] </string> <string name="RegionInfoAllowedResidents"> - Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS]) + Godkendte beboere: ([ALLOWEDAGENTS], maks. [MAXACCESS]) </string> <string name="RegionInfoAllowedGroups"> Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS]) </string> + <string name="ScriptLimitsParcelScriptMemory"> + Parcel script memory + </string> + <string name="ScriptLimitsParcelsOwned"> + Parceller listet: [PARCELS] + </string> + <string name="ScriptLimitsMemoryUsed"> + Memory brugt: [COUNT] kb ud af [MAX] kb; [AVAILABLE] kb tilgængeligt + </string> + <string name="ScriptLimitsMemoryUsedSimple"> + Memory brugt: [COUNT] kb + </string> + <string name="ScriptLimitsParcelScriptURLs"> + Parcel Script URL'er + </string> + <string name="ScriptLimitsURLsUsed"> + URL'er brugt: [COUNT] ud af [MAX]; [AVAILABLE] tilgængelige + </string> + <string name="ScriptLimitsURLsUsedSimple"> + URL'er brugt: [COUNT] + </string> + <string name="ScriptLimitsRequestError"> + Fejl ved anmodning om information + </string> + <string name="ScriptLimitsRequestNoParcelSelected"> + Ingen parcel valgt + </string> + <string name="ScriptLimitsRequestWrongRegion"> + Fejl: script information er kun tilgængelig i den nuværende region + </string> + <string name="ScriptLimitsRequestWaiting"> + Henter information... + </string> + <string name="ScriptLimitsRequestDontOwnParcel"> + Du har ikke rettigheder til at undersøge denne parcel + </string> + <string name="SITTING_ON"> + Sidder på + </string> + <string name="ATTACH_CHEST"> + Bryst + </string> + <string name="ATTACH_HEAD"> + Hoved + </string> + <string name="ATTACH_LSHOULDER"> + Venstre skulder + </string> + <string name="ATTACH_RSHOULDER"> + Højre skulder + </string> + <string name="ATTACH_LHAND"> + Venstre hånd + </string> + <string name="ATTACH_RHAND"> + Højre hånd + </string> + <string name="ATTACH_LFOOT"> + Venstre fod + </string> + <string name="ATTACH_RFOOT"> + Højre fod + </string> + <string name="ATTACH_BACK"> + Ryg + </string> + <string name="ATTACH_PELVIS"> + Bækken + </string> + <string name="ATTACH_MOUTH"> + Mund + </string> + <string name="ATTACH_CHIN"> + Hage + </string> + <string name="ATTACH_LEAR"> + Venstre øre + </string> + <string name="ATTACH_REAR"> + Højre øre + </string> + <string name="ATTACH_LEYE"> + Venstre øje + </string> + <string name="ATTACH_REYE"> + Højre øje + </string> + <string name="ATTACH_NOSE"> + Næse + </string> + <string name="ATTACH_RUARM"> + Højre overarm + </string> + <string name="ATTACH_RLARM"> + Højre underarm + </string> + <string name="ATTACH_LUARM"> + Venstre overarm + </string> + <string name="ATTACH_LLARM"> + Venstre underarm + </string> + <string name="ATTACH_RHIP"> + Højre hofte + </string> + <string name="ATTACH_RULEG"> + Højre lår + </string> + <string name="ATTACH_RLLEG"> + Højre underben + </string> + <string name="ATTACH_LHIP"> + Venstre hofte + </string> + <string name="ATTACH_LULEG"> + Venste lår + </string> + <string name="ATTACH_LLLEG"> + Venstre underben + </string> + <string name="ATTACH_BELLY"> + Mave + </string> + <string name="ATTACH_RPEC"> + Højre bryst + </string> + <string name="ATTACH_LPEC"> + Venstre bryst + </string> + <string name="ATTACH_HUD_CENTER_2"> + HUD Center 2 + </string> + <string name="ATTACH_HUD_TOP_RIGHT"> + HUD Øverst til højre + </string> + <string name="ATTACH_HUD_TOP_CENTER"> + HUD Foroven midtpå + </string> + <string name="ATTACH_HUD_TOP_LEFT"> + HUD Øverst til venstre + </string> + <string name="ATTACH_HUD_CENTER_1"> + HUD Center 1 + </string> + <string name="ATTACH_HUD_BOTTOM_LEFT"> + HUD Nederst til venstre + </string> + <string name="ATTACH_HUD_BOTTOM"> + HUD For neden + </string> + <string name="ATTACH_HUD_BOTTOM_RIGHT"> + HUD Nederst til højre + </string> <string name="CursorPos"> Linie [LINE], Kolonne [COLUMN] </string> @@ -1315,6 +1467,15 @@ tekstur i din beholdning. <string name="ClassifiedUpdateAfterPublish"> (vil blive opdateret efter offentliggørelse) </string> + <string name="NoPicksClassifiedsText"> + Du har ikke oprettet nogen favoritter eller annoncer. Klik på plus knappen nedenfor for at oprette en favorit eller en annonce. + </string> + <string name="NoAvatarPicksClassifiedsText"> + Bruger har ingen favoritter eller annoncer + </string> + <string name="PicksClassifiedsLoadingText"> + Henter... + </string> <string name="MultiPreviewTitle"> Vis først </string> @@ -1391,16 +1552,27 @@ tekstur i din beholdning. Ukendt fil efternavn [.%s] Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh </string> + <string name="MuteObject2"> + Blokér + </string> <string name="AddLandmarkNavBarMenu"> Tilføj landemærke... </string> <string name="EditLandmarkNavBarMenu"> Redigér landemærke... </string> - <string name="accel-mac-control">⌃</string> - <string name="accel-mac-command">⌘</string> - <string name="accel-mac-option">⌥</string> - <string name="accel-mac-shift">⇧</string> + <string name="accel-mac-control"> + ⌃ + </string> + <string name="accel-mac-command"> + ⌘ + </string> + <string name="accel-mac-option"> + ⌥ + </string> + <string name="accel-mac-shift"> + ⇧ + </string> <string name="accel-win-control"> Ctrl+ </string> @@ -1655,39 +1827,15 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Attached Earlobes"> Vedhæftede øreflipper </string> - <string name="Back Bangs"> - Nakkehår - </string> - <string name="Back Bangs Down"> - Nakkehår langt - </string> - <string name="Back Bangs Up"> - Nakkehår kort - </string> <string name="Back Fringe"> Nakkehår </string> - <string name="Back Hair"> - Volumen - </string> - <string name="Back Hair Down"> - Volumen nedad - </string> - <string name="Back Hair Up"> - Volumen op - </string> <string name="Baggy"> Posede </string> <string name="Bangs"> Pandehår </string> - <string name="Bangs Down"> - Pandehår ned - </string> - <string name="Bangs Up"> - Pandehår op - </string> <string name="Beady Eyes"> Stikkende øjne </string> @@ -1700,9 +1848,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Big Butt"> Stor bagdel </string> - <string name="Big Eyeball"> - Store øjenæbler - </string> <string name="Big Hair Back"> Stort hår: Bag </string> @@ -1877,9 +2022,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Corner Down"> Nedadvendt </string> - <string name="Corner Normal"> - Normalt - </string> <string name="Corner Up"> Opadvendt </string> @@ -1889,9 +2031,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Crooked Nose"> Skæv næse </string> - <string name="Cropped Hair"> - Kort hår - </string> <string name="Cuff Flare"> Svaj </string> @@ -1910,15 +2049,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Default Heels"> Standard hæle </string> - <string name="Default Toe"> - Standard snude - </string> <string name="Dense"> Tæt </string> - <string name="Dense hair"> - Tæt hår - </string> <string name="Double Chin"> Dobbelthage </string> @@ -1964,9 +2097,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Eye Spacing"> Øjenafstand </string> - <string name="Eyeball Size"> - Størrelse øjenæble - </string> <string name="Eyebrow Arc"> Bue på øjenbryn </string> @@ -1991,36 +2121,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Eyeliner Color"> Eyeliner farve </string> - <string name="Eyes Back"> - Dybtliggende øjne - </string> <string name="Eyes Bugged"> Udstående øjne </string> - <string name="Eyes Forward"> - Øjne fremme - </string> - <string name="Eyes Long Head"> - Eyes Long Head - </string> - <string name="Eyes Shear Left Up"> - Eyes Shear Left Up - </string> - <string name="Eyes Shear Right Up"> - Eyes Shear Right Up - </string> - <string name="Eyes Short Head"> - Eyes Short Head - </string> - <string name="Eyes Spread"> - Stor afstand - </string> - <string name="Eyes Sunken"> - Indsunkne øjne - </string> - <string name="Eyes Together"> - Tætsiddende - </string> <string name="Face Shear"> Ansigts symmetri </string> @@ -2030,30 +2133,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Far Set Eyes"> Stor afstand mellem øjne </string> - <string name="Fat"> - Tyk - </string> - <string name="Fat Head"> - Tykt hovede - </string> <string name="Fat Lips"> Tykke læber </string> - <string name="Fat Lower"> - Tyk nedre - </string> - <string name="Fat Lower Lip"> - Tyk underlæbe - </string> - <string name="Fat Torso"> - Tyk overkrop - </string> - <string name="Fat Upper"> - Tyk øvre - </string> - <string name="Fat Upper Lip"> - Tyk overlæbe - </string> <string name="Female"> Kvinde </string> @@ -2090,24 +2172,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Freckles"> Fregner </string> - <string name="Front Bangs Down"> - Pandehår - ned - </string> - <string name="Front Bangs Up"> - Pandehår - op - </string> <string name="Front Fringe"> Frynser foran </string> - <string name="Front Hair"> - Hår foran - </string> - <string name="Front Hair Down"> - Hår foran - ned - </string> - <string name="Front Hair Up"> - Hår foran - op - </string> <string name="Full Back"> Langt ud bagtil </string> @@ -2381,9 +2448,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Long arms"> Lange arme </string> - <string name="Longcuffs"> - Longcuffs - </string> <string name="Loose Pants"> Løse bukser </string> @@ -2546,9 +2610,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="No Eyeshadow"> Ingen øjenskygge </string> - <string name="No Heels"> - Ingen hæle - </string> <string name="No Lipgloss"> Ingen lipgloss </string> @@ -2606,9 +2667,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Nostril Width"> Næsebor bredde </string> - <string name="Old"> - Gammel - </string> <string name="Opaque"> Uigennemsigtig </string> @@ -2708,9 +2766,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Pointy Heels"> Spidse hæle </string> - <string name="Pointy Toe"> - Spids snude - </string> <string name="Ponytail"> Hestehale </string> @@ -2735,15 +2790,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Red Hair"> Rødt hår </string> - <string name="Red Skin"> - Rød hud - </string> <string name="Regular"> Almindelig </string> - <string name="Regular Muscles"> - Almindelige muskler - </string> <string name="Right Part"> Højre skildning </string> @@ -2753,9 +2802,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Round"> Rund </string> - <string name="Round Forehead"> - Rund pande - </string> <string name="Ruddiness"> Rødmossethed </string> @@ -2768,24 +2814,12 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Saddle Bags"> Ridebukselår </string> - <string name="Saddlebags"> - Ridebukselår - </string> - <string name="Scrawny"> - Radmager - </string> <string name="Scrawny Leg"> Magert ben </string> <string name="Separate"> Separat </string> - <string name="Shading"> - Skygger - </string> - <string name="Shadow hair"> - Skygge hår - </string> <string name="Shallow"> Lille </string> @@ -2798,15 +2832,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Shear Front"> "Måne" </string> - <string name="Shear Left"> - Venstre - </string> <string name="Shear Left Up"> Venstre op </string> - <string name="Shear Right"> - Højre - </string> <string name="Shear Right Up"> Højre op </string> @@ -2867,15 +2895,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Shoulders"> Skuldre </string> - <string name="Side Bangs"> - Sidehår - </string> - <string name="Side Bangs Down"> - Ned - </string> - <string name="Side Bangs Up"> - Op - </string> <string name="Side Fringe"> Side frynser </string> @@ -2891,9 +2910,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Sides Hair Up"> Op </string> - <string name="Skinny"> - Tynd - </string> <string name="Skinny Neck"> Tynd hals </string> @@ -2942,9 +2958,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Socks Length"> Strømper - længde </string> - <string name="Some"> - Nogen - </string> <string name="Soulpatch"> Soulpatch </string> @@ -2963,9 +2976,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Squash Head"> Bredt hovede </string> - <string name="Squash/Stretch Head"> - Sammentryk/stræk hovede - </string> <string name="Stretch Head"> Stræk hovede </string> @@ -2984,18 +2994,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Sweep Forward"> Stryge fremad </string> - <string name="Swept Back"> - Tilbagestrøget - </string> - <string name="Swept Back Hair"> - Tilbagestrøget hår - </string> - <string name="Swept Forward"> - Fremadstrøget - </string> - <string name="Swept Forward Hair"> - Fremadstrøget hår - </string> <string name="Tall"> Høj </string> @@ -3014,9 +3012,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Thick Toe"> Bred snude </string> - <string name="Thickness"> - Tykkelse - </string> <string name="Thin"> Tynd </string> @@ -3047,12 +3042,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Tight Sleeves"> Stramme ærmer </string> - <string name="Tilt Left"> - Hæld til venstre - </string> - <string name="Tilt Right"> - Hæld til højre - </string> <string name="Toe Shape"> Sko form </string> @@ -3194,6 +3183,21 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="IM_moderator_label"> (Moderator) </string> + <string name="started_call"> + Startet et stemme opkald + </string> + <string name="joined_call"> + Tilsluttet stemme opkaldet + </string> + <string name="ringing-im"> + Tilslutter stemme opkald... + </string> + <string name="connected-im"> + Forbundet, klik på Forlad for at lægge på + </string> + <string name="hang_up-im"> + Forladt stemme opkald + </string> <string name="only_user_message"> Du er den eneste deltager i denne samtale </string> @@ -3204,7 +3208,10 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat. </string> <string name="muted_message"> - Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet. + Du har blokeret denne beboer. Sendes en besked, vil beboeren fjernes fra blokeringslisten. + </string> + <string name="generic"> + Fejl ved anmodning, prøv venligst igen senere </string> <string name="generic_request_error"> Kunne ikke etablere forbindelse, prøv igen senere @@ -3224,19 +3231,37 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="not_a_mod_error"> Du er ikke moderator for denne samtale. </string> + <string name="muted"> + En gruppe moderator har deaktiveret din tekst chat. + </string> <string name="muted_error"> Du er blevet "blokeret". </string> <string name="add_session_event"> Ikke muligt at tilføge brugere til samtale med [RECIPIENT]. </string> + <string name="message"> + Kunne ikke sende din besked til session med [RECIPIENT]. + </string> <string name="message_session_event"> Ikke muligt at sende din besked til samtalen med [RECIPIENT]. </string> + <string name="mute"> + Fejl under moderation. + </string> + <string name="removed"> + Du er blevet fjernet fra denne gruppe. + </string> <string name="removed_from_group"> Du er blevet fjernet fra gruppen. </string> <string name="close_on_no_ability"> Du har ikke længere mulighed for at deltage i samtalen </string> + <string name="unread_chat_single"> + [SOURCES] har sagt noget nyt + </string> + <string name="unread_chat_multiple"> + [SOURCES] har sagt noget nyt + </string> </strings> diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml index b8616ea128..87371b05e3 100644 --- a/indra/newview/skins/default/xui/de/floater_camera.xml +++ b/indra/newview/skins/default/xui/de/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Kamera nach oben, unten, links und rechts bewegen </floater.string> + <floater.string name="orbit_mode_title"> + Kreisen + </floater.string> + <floater.string name="pan_mode_title"> + Schwenken + </floater.string> + <floater.string name="avatar_view_mode_title"> + Voreinstellungen + </floater.string> + <floater.string name="free_mode_title"> + Objekt ansehen + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/> <panel name="zoom" tool_tip="Kamera auf Fokus zoomen"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="Kamera kreisen"/> <button label="" name="pan_btn" tool_tip="Kamera schwenken"/> - <button label="" name="avatarview_btn" tool_tip="Avatarsicht"/> + <button label="" name="avatarview_btn" tool_tip="Voreinstellungen"/> <button label="" name="freecamera_btn" tool_tip="Objekt ansehen"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml index a41ac521a3..cf663e2e1b 100644 --- a/indra/newview/skins/default/xui/de/floater_event.xml +++ b/indra/newview/skins/default/xui/de/floater_event.xml @@ -9,6 +9,18 @@ <floater.string name="dont_notify"> Nicht benachrichtigen </floater.string> + <floater.string name="moderate"> + Moderat + </floater.string> + <floater.string name="adult"> + Adult + </floater.string> + <floater.string name="general"> + Allgemein + </floater.string> + <floater.string name="unknown"> + Unbekannt + </floater.string> <layout_stack name="layout"> <layout_panel name="profile_stack"> <text name="event_name"> @@ -21,12 +33,21 @@ Ausgeführt von: </text> <text initial_value="(wird in Datenbank gesucht)" name="event_runby"/> + <text name="event_date_label"> + Datum: + </text> <text name="event_date"> 10/10/2010 </text> + <text name="event_duration_label"> + Dauer: + </text> <text name="event_duration"> 1 Stunde </text> + <text name="event_covercharge_label"> + Eintritt: + </text> <text name="event_cover"> Kostenlos </text> diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml index 03930c8ed6..b978322cef 100644 --- a/indra/newview/skins/default/xui/de/floater_moveview.xml +++ b/indra/newview/skins/default/xui/de/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> Rückwärts fliegen (Nach-Unten-Pfeil oder S drücken) </string> + <string name="walk_title"> + Gehen + </string> + <string name="run_title"> + Rennen + </string> + <string name="fly_title"> + Fliegen + </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="Gehen"/> <button label="" name="mode_run_btn" tool_tip="Rennen"/> <button label="" name="mode_fly_btn" tool_tip="Fliegen"/> - <button label="Landen" name="stop_fly_btn" tool_tip="Landen"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml index f978042cc2..aa582838a4 100644 --- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml @@ -16,6 +16,9 @@ Es ist niemand in der Nähe, der Voice aktiviert hat. </string> <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Mein Avatar:"/> + </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="Anruf beenden" name="leave_call_btn"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml index ecd6d7ff3e..097a60a444 100644 --- a/indra/newview/skins/default/xui/de/floater_water.xml +++ b/indra/newview/skins/default/xui/de/floater_water.xml @@ -10,7 +10,7 @@ <button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/> <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Einstellungen" name="Settings"> + <panel label="EINSTELLUNGEN" name="Settings"> <text name="BHText"> Wassertrübungsfarbe </text> @@ -44,7 +44,7 @@ Mischungsmultiplikator </text> </panel> - <panel label="Bild" name="Waves"> + <panel label="BILD" name="Waves"> <text name="BHText"> Richtung große Welle </text> diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml index 3e06d8f06b..5b59336f9d 100644 --- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/de/floater_windlight_options.xml @@ -8,7 +8,7 @@ <button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/> <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/> <tab_container name="WindLight Tabs"> - <panel label="Atmosphäre" name="Atmosphere"> + <panel label="ATMOSPHÄRE" name="Atmosphere"> <text name="BHText"> Horizontfarbe </text> @@ -62,7 +62,7 @@ </text> <button label=" ?" name="WLMaxAltitudeHelp"/> </panel> - <panel label="Licht" name="Lighting"> + <panel label="LICHT" name="Lighting"> <text name="SLCText"> Sonne/Mond-Farbe </text> @@ -118,7 +118,7 @@ </text> <button label=" ?" name="WLStarBrightnessHelp"/> </panel> - <panel label="Wolken" name="Clouds"> + <panel label="WOLKEN" name="Clouds"> <text name="WLCloudColorText"> Wolkenfarbe </text> diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index 7d8a634452..a80be2b594 100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml @@ -5,7 +5,8 @@ Legende </text> </panel> - <panel> + <panel + name="layout_panel_2"> <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position meines Avatars zentrieren"/> <text name="me_label"> Ich @@ -37,7 +38,7 @@ </text> <check_box label="PG" name="event_chk"/> <text name="pg_label"> - Allgemein + Generell </text> <check_box initial_value="true" label="Mature" name="event_mature_chk"/> <text name="mature_label"> @@ -48,12 +49,14 @@ Adult </text> </panel> - <panel> + <panel + name="layout_panel_3"> <text name="find_on_map_label"> Auf Karte anzeigen </text> </panel> - <panel> + <panel + name="layout_panel_4"> <combo_box label="Online-Freunde" name="friend combo" tool_tip="Freunde auf Karte anzeigen"> <combo_box.item label="Meine Freunde: Online" name="item1"/> </combo_box> @@ -71,12 +74,14 @@ <button font="SansSerifSmall" label="SLurl kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLurl zur Verwendung im Web."/> <button label="Auswahl anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/> </panel> - <panel> + <panel + name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel> + <panel + name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index 320f93c796..8bb7b66482 100644 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml @@ -5,6 +5,7 @@ <menu_item_call label="Bauen" name="Build"/> <menu_item_call label="Öffnen" name="Open"/> <menu_item_call label="Hier sitzen" name="Object Sit"/> + <menu_item_call label="Aufstehen" name="Object Stand Up"/> <menu_item_call label="Objektprofil" name="Object Inspect"/> <menu_item_call label="Hineinzoomen" name="Zoom In"/> <context_menu label="Anziehen ▶" name="Put On"> @@ -18,6 +19,7 @@ <menu_item_call label="Zurückgeben" name="Return..."/> <menu_item_call label="Löschen" name="Delete"/> </context_menu> + <menu_item_call label="Kaufen" name="Pie Object Bye"/> <menu_item_call label="Nehmen" name="Pie Object Take"/> <menu_item_call label="Kopie nehmen" name="Take Copy"/> <menu_item_call label="Bezahlen" name="Pay..."/> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml index a69ef3891a..1db964357f 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml @@ -5,6 +5,7 @@ <menu_item_call label="Freund entfernen" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Anrufen" name="Call"/> + <menu_item_call label="Karte" name="Map"/> <menu_item_call label="Teilen" name="Share"/> <menu_item_call label="Bezahlen" name="Pay"/> <menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index f09bf50fe6..c628cb4b61 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -43,6 +43,8 @@ <menu_item_check label="Strahlen" name="beacons"/> <menu_item_check label="Grundstücksgrenzen" name="Property Lines"/> <menu_item_check label="Landeigentümer" name="Land Owners"/> + <menu_item_check label="Koordinaten" name="Coordinates"/> + <menu_item_check label="Parzelleneigenschaften" name="Parcel Properties"/> </menu> <menu_item_call label="Teleport nach Hause" name="Teleport Home"/> <menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/> @@ -81,7 +83,8 @@ <menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/> <menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/> <menu label="Objekt" name="Object"> - <menu_item_call label="Kaufen" name="Menu Object Take"/> + <menu_item_call label="Kaufen" name="Menu Object Buy"/> + <menu_item_call label="Nehmen" name="Menu Object Take"/> <menu_item_call label="Kopie nehmen" name="Take Copy"/> <menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/> <menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/> @@ -405,7 +408,7 @@ <menu_item_call label="Offizielles Linden-Blog" name="Official Linden Blog"/> <menu_item_call label="Scripting-Portal" name="Scripting Portal"/> <menu label="Fehlermeldungen" name="Bug Reporting"> - <menu_item_call label="Allgemeine Probleme-Tracker" name="Public Issue Tracker"/> + <menu_item_call label="Allgemeiner Probleme-Tracker" name="Public Issue Tracker"/> <menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker" name="Publc Issue Tracker Help"/> <menu_item_call label="Fehlermeldungs-1x1" name="Bug Reporing 101"/> <menu_item_call label="Sicherheitsfragen" name="Security Issues"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index a034fa5088..acfbee7f36 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -455,7 +455,6 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht. <notification name="UnsupportedHardware"> Ihr Computer entspricht leider nicht den Mindestanforderungen von [APP_NAME]. Dies kann zur Folge haben, dass das Programm nicht sehr gut ausgeführt wird. Bei nicht unterstützten Systemkonfigurationen kann Ihnen unser [SUPPORT_SITE] leider nicht helfen. -MINDESTANF. Weitere Informationen finden Sie auf [_URL]. <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=de @@ -2079,7 +2078,7 @@ Wählen Sie eine kleinere Landfläche. Einige Begriffe in Ihrer Suchanfrage wurden ausgeschlossen, aufgrund von in den Community Standards definierten Inhaltsbeschränkungen. </notification> <notification name="NoContentToSearch"> - Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Allgemein, Moderat oder Adult). + Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Generell, Moderat oder Adult). </notification> <notification name="GroupVote"> [NAME] hat eine Abstimmung vorgeschlagen über: @@ -2353,6 +2352,12 @@ Versuchen Sie es in einigen Minuten erneut. <notification name="FriendshipDeclined"> [NAME] hat Ihr Freundschaftsangebot abgelehnt. </notification> + <notification name="FriendshipAcceptedByMe"> + Ihr Freundschaftsangebot wurde angeommen. + </notification> + <notification name="FriendshipDeclinedByMe"> + Ihr Freundschaftsangebot wurde abgelehnt. + </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] bietet Ihnen ihre/seine Visitenkarte an. Ihrem Inventar wird ein Lesezeichen erstellt, damit Sie diesem Einwohner einfach eine IM schicken können. @@ -2562,7 +2567,7 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt. </notification> <notification name="ConfirmCloseAll"> Möchten Sie wirklich alle IMs schließen? - <usetemplate name="okcancelignore" notext="Abbrechen" yestext="OK"/> + <usetemplate ignoretext="Bestätigen, bevor ich alle IMs schließe." name="okcancelignore" notext="Abbrechen" yestext="OK"/> </notification> <notification name="AttachmentSaved"> Der Anhang wurde gespeichert. diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml index d824eff338..2bbbaf2537 100644 --- a/indra/newview/skins/default/xui/de/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml @@ -4,7 +4,7 @@ Moderat </panel.string> <panel.string name="type_pg"> - Allgemeiner Inhalt + Genereller Inhalt </panel.string> <panel.string name="l$_price"> [PRICE] L$ diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index 0d3c082a16..f300679e16 100644 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml @@ -47,7 +47,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. <check_box label="Kosten für Beitritt" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/> <spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/> <combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppeninformation moderate Inhalte enthält"> - <combo_box.item label="Allgemeiner Inhalt" name="pg"/> + <combo_box.item label="Genereller Inhalt" name="pg"/> <combo_box.item label="Moderater Inhalt" name="mature"/> </combo_box> <check_box initial_value="true" label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen"/> diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml index 0dca272633..abf8011d9d 100644 --- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="Teilen" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Bezahlen" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml new file mode 100644 index 0000000000..7c7448c061 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Freunde_online_Status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index a119c86b47..cf61f0870d 100644 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml @@ -21,7 +21,7 @@ <accordion_tab name="tab_all" title="Alle"/> </accordion> <text name="no_friends_msg"> - Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie auf einen Einwohner und fügen Sie diesen als Freund hinzu. + Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie mit rechts auf einen Einwohner und fügen Sie diesen als Freund hinzu. Wenn Sie nach Orten suchen, an denen sich Leute befinden, verwenden Sie [secondlife:///app/worldmap die Karte]. </text> <panel label="bottom_panel" name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml index fd4da94edc..3af4ee5a1e 100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml @@ -68,7 +68,7 @@ <text name="maturity_value" value="unbekannt"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parzelle"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Einstufung:"/> <text name="rating_value" value="unbekannt"/> <text name="voice_label" value="Voice:"/> @@ -87,7 +87,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Region"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Region:"/> <text name="region_name" value="Mooseland"/> <text name="region_type_label" value="Typ:"/> @@ -104,7 +104,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Grundstück"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Grundstück:"/> <text name="estate_rating_label" value="Einstufung:"/> <text name="estate_owner_label" value="Eigentümer:"/> @@ -112,7 +112,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="Zum Verkauf"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Preis:"/> <text name="area_label" value="Gebiet:"/> <text name="traffic_label" value="Traffic:"/> diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml index 7359a4fda4..2215ea3988 100644 --- a/indra/newview/skins/default/xui/de/panel_places.xml +++ b/indra/newview/skins/default/xui/de/panel_places.xml @@ -7,9 +7,9 @@ <button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/> <button label="Karte" name="map_btn" width="60"/> <button label="Bearbeiten" name="edit_btn" tool_tip="Landmarken-Info bearbeiten"/> - <button name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - <button label="Schließen" name="close_btn"/> - <button label="Abbrechen" name="cancel_btn" width="66"/> + <button label="▼" name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/> <button label="Speichern" name="save_btn" width="66"/> + <button label="Abbrechen" name="cancel_btn" width="66"/> + <button label="Schließen" name="close_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index f580691c0d..626e35dd0b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Text-Chat" name="chat"> + <text name="font_size"> + Schriftgröße: + </text> <radio_group name="chat_font_size"> <radio_item label="Klein" name="radio" value="0"/> <radio_item label="Mittel" name="radio2" value="1"/> <radio_item label="Groß" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Schriftfarbe: + </text> <color_swatch label="Sie" name="user"/> <text name="text_box1"> Ich diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index bd9e10b641..b59a779853 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -20,13 +20,13 @@ (Erfordert Neustart) </text> <text name="maturity_desired_prompt" width="350"> - Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen: + Ich möchte auf Inhalt mit folgender Einstufung zugreifen: </text> <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item label="Allgemein, Moderat, Adult" name="Desired_Adult"/> - <combo_box.item label="Allgemein und Moderat" name="Desired_Mature"/> - <combo_box.item label="Allgemein" name="Desired_PG"/> + <combo_box.item label="Generell, Moderat, Adult" name="Desired_Adult"/> + <combo_box.item label="Generell und Moderat" name="Desired_Mature"/> + <combo_box.item label="Generell" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> Startstandort: diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index e7bb768925..16b4598486 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml @@ -55,7 +55,7 @@ <text name="AvatarRenderingText"> Avatar-Darstellung: </text> - <check_box initial_value="true" label="Scheinavatare" name="AvatarImpostors"/> + <check_box initial_value="true" label="Vereinfachte Avatardarstellung" name="AvatarImpostors"/> <check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/> <check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/> <slider label="Sichtweite:" name="DrawDistance"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index b01db30c82..96a86ed85d 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -13,9 +13,12 @@ <check_box label="Aktiviert" name="enable_voice_check"/> <check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="wahr"/> <check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="wahr"/> - <text name="Listen from"> + <text name="voice_chat_settings"> Voice-Chat-Einstellungen </text> + <text name="Listen from"> + Zuhören von: + </text> <radio_group name="ear_location"> <radio_item label="Kameraposition" name="0"/> <radio_item label="Avatarposition" name="1"/> diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml index 978b701054..2885e5bd3a 100644 --- a/indra/newview/skins/default/xui/de/panel_region_general.xml +++ b/indra/newview/skins/default/xui/de/panel_region_general.xml @@ -36,7 +36,7 @@ <button label="?" name="agent_limit_help"/> <spinner label="Objektbonus" name="object_bonus_spin"/> <button label="?" name="object_bonus_help"/> - <text label="Alterseinstufung" name="access_text"> + <text label="Inhaltseinstufung" name="access_text"> Einstufung: </text> <combo_box label="Moderat" name="access_combo"> diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml index 5b8137af4a..be21429007 100644 --- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml @@ -2,5 +2,5 @@ <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> <panel name="panel_stand_stop_flying"> <button label="Stehen" name="stand_btn" tool_tip="Klicken Sie hier, um aufzustehen."/> - <button label="Landen" name="stop_fly_btn" tool_tip="Landen"/> + <button label="Flug stoppen" name="stop_fly_btn" tool_tip="Flug stoppen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml index 283df990ae..0e182fa417 100644 --- a/indra/newview/skins/default/xui/de/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml @@ -22,10 +22,10 @@ [AMT] L$ </panel.string> <button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/> - <button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/> + <button label="Kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/> <text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)"> 24:00 H PST </text> - <button name="media_toggle_btn" tool_tip="Klicken, um Medien ein-/auszuschalten"/> + <button name="media_toggle_btn" tool_tip="Alle Medien starten/stoppen (Musik, Video, Webseiten)"/> <button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/> </panel> diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml index 825acac79d..81f1ebdf91 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="Objektprofil"/> <text name="where" value="(inworld)"/> - <panel label=""> + <panel name="properties_panel" label=""> <text name="Name:"> Name: </text> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index d377d0a00e..c4b540d08a 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -636,7 +636,7 @@ Nicht verbunden </string> <string name="SIM_ACCESS_PG"> - Allgemein + Generell </string> <string name="SIM_ACCESS_MATURE"> Moderat @@ -753,7 +753,7 @@ Alpha </string> <string name="tattoo"> - Tätowierung + Taetowierung </string> <string name="invalid"> ungültig @@ -1506,6 +1506,9 @@ <string name="NoPicksClassifiedsText"> Sie haben keine Auswahl oder Anzeigen erstelllt. Klicken Sie auf die „Plus"-Schaltfläche, um eine Auswahl oder Anzeige zu erstellen. </string> + <string name="NoAvatarPicksClassifiedsText"> + Der Einwohner hat eine Auswahl oder Anzeigen im Profil. + </string> <string name="PicksClassifiedsLoadingText"> Wird geladen... </string> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index d2e5473157..25016e0673 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -2,6 +2,7 @@ <floater legacy_header_height="18" background_visible="true" + default_tab_group="1" follows="all" height="350" layout="topleft" @@ -18,12 +19,14 @@ min_height="190"> <layout_stack animate="false" + default_tab_group="2" follows="all" height="320" width="360" layout="topleft" orientation="horizontal" name="im_panels" + tab_group="1" top="20" left="0"> <layout_panel @@ -35,7 +38,9 @@ auto_resize="false" user_resize="true" /> <layout_panel + default_tab_group="3" left="0" + tab_group="2" top="0" height="200" width="245" @@ -75,6 +80,7 @@ label="To" layout="bottomleft" name="chat_editor" + tab_group="3" width="240"> </line_editor> </layout_panel> diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml new file mode 100644 index 0000000000..3225843d09 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + height="200" + layout="topleft" + name="publish_classified" + help_topic="price_for_listing" + title="Publishing Classified" + width="320"> + <text + top="20" + follows="top|left" + font="SansSerif" + height="60" + layout="topleft" + left="15" + word_wrap="true" + name="explanation_text"> + +Your classified ad will run for one week from the date it is published. + +Remember, Classified fees are non-refundable. + + </text> + <spinner + decimal_digits="0" + follows="left|top" + halign="left" + height="23" + increment="1" + label_width="70" + label="Price for Ad: " + v_pad="10" + layout="topleft" + left="15" + value="50" + min_val="50" + max_val="99999" + name="price_for_listing" + top_pad="10" + tool_tip="Price for listing." + width="150" /> + <text + follows="top|left" + font="SansSerif" + height="60" + layout="topleft" + left_pad="5" + top_delta="0" + word_wrap="true" + value="L$" + name="l$_text" /> + <text + follows="top|right" + font="SansSerif" + height="20" + layout="topleft" + left="15" + name="more_info_text" + top_pad="-20" + width="300"> +More info (link to classified help) + </text> + <button + follows="top|left" + height="22" + label="Publish" + layout="topleft" + left="105" + name="publish_btn" + top="160" + width="100" /> + <button + follows="top|left" + height="22" + label="Cancel" + layout="topleft" + left_pad="5" + name="cancel_btn" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 86ac7c8e54..291f8f6f51 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -53,7 +53,8 @@ follows="right|top" height="126" top_pad="0" - width="238"> + width="238" + name="layout_panel_2"> <button follows="right|top" height="22" @@ -374,7 +375,8 @@ top_pad="0" width="238" background_visible="true" - bg_alpha_color="DkGray2"> + bg_alpha_color="DkGray2" + name="layout_panel_3"> <text text_color="White" font="SansSerifLarge" @@ -396,7 +398,8 @@ follows="right|top|bottom" height="310" top_pad="0" - width="238"> + width="238" + name="layout_panel_4"> <icon color="0.5 0 0 1" follows="top|right" @@ -638,7 +641,8 @@ top_pad="0" width="238" background_visible="true" - bg_alpha_color="DkGray2"> + bg_alpha_color="DkGray2" + name="layout_panel_5"> <text text_color="White" font="SansSerifLarge" @@ -660,7 +664,8 @@ height="30" min_height="30" top_pad="0" - width="238"> + width="238" + name="layout_panel_6"> <icon follows="left|bottom" height="16" @@ -670,7 +675,7 @@ mouse_opaque="true" name="zoom_icon" top_pad="7" - width="16" /> + width="16" ></icon> <slider follows="left|bottom" height="16" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4264b86a72..a2540237c8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -249,7 +249,7 @@ Save all changes to clothing/body parts? Non-friends won't know that you've choosen to ignore their calls and instant messages. <usetemplate name="okbutton" - yestext="Yes"/> + yestext="OK"/> </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index a8c72e03bd..932e34d694 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -22,6 +22,14 @@ name="l$_price"> L$[PRICE] </panel.string> + <panel.string + name="click_through_text_fmt"> + [TELEPORT] teleport, [MAP] map, [MAP] profile + </panel.string> + <panel.string + name="date_fmt"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> <button follows="top|right" height="23" @@ -66,15 +74,25 @@ height="610" left="0" width="285"> + <panel + name="snapshot_panel" + layout="topleft" + follows="left|top|right" + height="197" + left="10" + top="10" + width="275" + > <texture_picker enabled="false" follows="left|top|right" height="197" - width="272" layout="topleft" - left="11" + left="0" name="classified_snapshot" - top="10" /> + top="0" + width="275" /> + </panel> <text_editor allow_scroll="false" bg_visible="false" @@ -101,7 +119,7 @@ left="10" name="classified_location_label" text_color="white" - top_pad="10" + top_pad="5" value="Location:" width="250" /> <text_editor @@ -129,7 +147,7 @@ text_color="white" top_pad="10" value="Content Type:" - width="250" /> + width="140" /> <text_editor allow_scroll="false" bg_visible="false" @@ -137,11 +155,11 @@ h_pad="0" height="18" layout="topleft" - left="10" + left_pad="0" name="content_type" read_only="true" - width="290" - top_pad="15" + width="150" + top_pad="-10" v_pad="0" value="[content type]" /> <text @@ -152,9 +170,9 @@ left="10" name="category_label" text_color="white" - top_pad="10" + top_pad="0" value="Category:" - width="250" /> + width="140" /> <text_editor allow_html="true" allow_scroll="false" @@ -163,11 +181,11 @@ h_pad="0" height="18" layout="topleft" - left="10" + left_pad="0" name="category" read_only="true" - width="290" - top_pad="5" + width="150" + top_pad="-10" v_pad="0" value="[category]" /> <text @@ -176,11 +194,38 @@ height="10" layout="topleft" left="10" + name="creation_date_label" + text_color="white" + top_pad="0" + value="Creation date:" + width="140" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + halign="left" + height="16" + layout="topleft" + left_pad="0" + name="creation_date" + read_only="true" + top_pad="-10" + tool_tip="Creation date" + v_pad="0" + value="[date]" + width="150" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" name="price_for_listing_label" text_color="white" - top_pad="10" + top_pad="5" value="Price for listing:" - width="250" /> + width="140" /> <text_editor allow_scroll="false" bg_visible="false" @@ -189,10 +234,10 @@ halign="left" height="16" layout="topleft" - left="10" + left_pad="0" name="price_for_listing" read_only="true" - top_pad="5" + top_pad="-10" tool_tip="Price for listing." v_pad="0" value="[price]" @@ -209,6 +254,44 @@ height="250"> <layout_panel auto_resize="false" + name="clickthrough_layout_panel" + layout="topleft" + follows="top|left" + left="0" + top="0" + width="290" + height="26" + user_resize="false"> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="click_through_label" + text_color="white" + top_pad="0" + value="Clicks:" + width="140" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + halign="left" + height="16" + layout="topleft" + left_pad="0" + name="click_through_text" + read_only="true" + top_pad="-10" + tool_tip="Click through data" + v_pad="0" + value="[clicks]" + width="150" /> + </layout_panel> + <layout_panel + auto_resize="false" name="price_layout_panel" layout="topleft" follows="top|left" diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 6cc6c51fe0..c1b352031f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -16,6 +16,12 @@ name="location_notice"> (will update after save) </panel.string> + <string name="publish_label"> + Publish + </string> + <string name="save_label"> + Save + </string> <button follows="top|right" height="23" @@ -62,24 +68,33 @@ height="690" left="0" width="285"> + <panel + name="snapshot_panel" + layout="topleft" + follows="left|top|right" + height="197" + left="10" + top="10" + width="272"> <texture_picker follows="left|top|right" height="197" width="272" layout="topleft" - top="10" - left="11" + top="0" + left="0" name="classified_snapshot" /> - <icon + <icon height="197" image_name="spacer24.tga" layout="topleft" name="edit_icon" label="" tool_tip="Click to select an image" - top="10" - left="11" - width="286" /> + top="0" + left="0" + width="272" /> + </panel> <text type="string" length="1" @@ -272,7 +287,7 @@ <button follows="bottom|left" height="23" - label="Save" + label="[LABEL]" layout="topleft" name="save_changes_btn" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 5147bb72d0..701a14e1c5 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -44,11 +44,16 @@ background_visible="true" tab_stop="false" top="2" width="23" /> - <text + <text_editor + allow_scroll="false" + bg_visible="false" + read_only = "true" layout="topleft" name="group_name" + v_pad="0" value="(Loading...)" font="SansSerifHugeBold" + h_pad="0" height="26" left_pad="10" text_color="LtGray" diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 28c4adf67c..88566ea037 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -111,7 +111,7 @@ layout="topleft" min_height="25" width="100" - name="share_btn_panel" + name="pay_btn_panel" user_resize="false"> <button auto_resize="true" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index e6f67078d1..50983d2976 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -415,6 +415,7 @@ halign="center" layout="topleft" left="0" name="All Items" + sort_order_setting="InventorySortOrder" top="16" width="290" /> <inventory_panel diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 0c57b99b68..13791a6d32 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -28,6 +28,16 @@ <string name="groups_filter_label" value="Filter Groups" /> + <!-- + *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes. + They are not defined as translatable in VLT. See EXT-5931 + --> + <string + name="no_filtered_groups_msg" + value="[secondlife:///app/search/groups Try finding the group in search?]" /> + <string + name="no_groups_msg" + value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> <filter_editor text_pad_left="10" follows="left|top|right" @@ -240,13 +250,17 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t name="groups_panel" top="0" width="313"> + <!-- + *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931 + Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() + --> <group_list follows="all" height="345" layout="topleft" left="0" name="group_list" - no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]" + no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]" no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" width="313" /> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 44b2508e56..01a27a08c7 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -333,6 +333,7 @@ height="160" layout="topleft" left="0" + name="parcel_characteristics_panel" top="0" width="275"> <icon @@ -544,6 +545,7 @@ height="125" layout="topleft" left="0" + name="region_information_panel" top="0" width="290"> <text @@ -670,6 +672,7 @@ height="189" layout="topleft" left="0" + name="estate_information_panel" top="0" width="290"> <text @@ -758,6 +761,7 @@ height="300" layout="topleft" left="0" + name="sales_panel" top="0" width="290"> <text diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 2e81139ef2..3d434361b9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -14,6 +14,7 @@ layout="topleft" left="30" height="12" + name="font_size" width="120" top="10"> Font size: @@ -60,6 +61,7 @@ layout="topleft" left="30" height="12" + name="font_colors" top_pad="10" width="120" > diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index c188c1bf8b..8a1f74c46c 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -3,7 +3,7 @@ background_opaque="true" background_visible="true" bg_opaque_color="MouseGray" - chrome="true" + chrome="true" follows="top|right" height="19" layout="topleft" @@ -11,7 +11,7 @@ mouse_opaque="false" name="status" top="19" - tab_stop="false" + tab_stop="false" width="1000"> <panel.string name="StatBarDaysOfWeek"> @@ -51,12 +51,12 @@ image_unselected="spacer35.tga" image_pressed="spacer35.tga" height="16" - right="-210" + right="-220" label_shadow="false" name="buycurrency" tool_tip="My Balance" top="3" - width="110" /> + width="120" /> <button auto_resize="true" halign="right" @@ -75,7 +75,7 @@ pad_bottom="2" tool_tip="Click to buy more L$" top="2" - width="45" /> + width="55" /> <text type="string" font="SansSerifSmall" @@ -88,7 +88,7 @@ left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="80"> + width="100"> 24:00 AM PST </text> <button diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 6588663bac..86739b24c8 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -94,6 +94,7 @@ layout="topleft" left="10" help_topic="" + name="properties_panel" top="45" width="313" background_visible="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 455b4be264..59c54f0cad 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1769,6 +1769,9 @@ Clears (deletes) the media and all params from the given face. <string name="tattoo">Tattoo</string> <string name="invalid">invalid</string> + <!-- Wearable List--> + <string name="NewWearable">New [WEARABLE_ITEM]</string> + <!-- LLGroupNotify --> <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 --> <string name="next">Next</string> @@ -2104,6 +2107,9 @@ Clears (deletes) the media and all params from the given face. <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> + <!-- panel preferences general --> + <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <!-- Mute --> <string name="MuteByName">(by name)</string> <string name="MuteAgent">(Resident)</string> diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index a42f9a8e3e..cb1aa5eaa1 100644 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml @@ -54,7 +54,7 @@ Gracias a los siguientes Residentes por ayudarnos a estar seguros de que, hoy po -No es frecuente el pensamiento que puede hacer que lo que hasta ahora no existía de pronto salte a la vista. Sí es frecuente -y engañoso- gritar 'A mí se me podía haber ocurrido eso', pero el hecho es que no se hizo, un hecho muy significativo y revelador. +No es frecuente la mente que puede hacer que lo que hasta ahora no existía de pronto salte a la vista. Sí es frecuente -y engañoso- gritar 'A mí se me podía haber ocurrido eso', pero el hecho es que no se hizo, un hecho muy significativo y revelador. -- Douglas Adams </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index bcb970c79d..46531c5e58 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -397,7 +397,7 @@ la textura: </text> <texture_picker label="" left="97" name="media texture" tool_tip="Pulse para elegir una imagen"/> <text name="replace_texture_help" width="285"> - Cuando pulses la flecha 'play', los objetos que usen esta textura mostrarán la película o la página web. Selecciona la miniatura para elegir una textura distinta. + Cuando pulses la flecha 'play', los objetos que usen esta textura mostrarán la película o la página web. Selecciona la miniatura para elegir una textura distinta. </text> <check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/> <text left="102" name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)." width="120"> @@ -415,7 +415,7 @@ los media: <check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/> </panel> <panel label="SONIDO" name="land_audio_panel"> - <check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Marcando esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/> + <check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Al marcar esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/> <check_box label="Activar la voz" name="parcel_enable_voice_channel"/> <check_box label="Autorizar la voz (establecido por el Estado)" name="parcel_enable_voice_channel_is_estate_disabled"/> <check_box label="Limitar la voz a esta parcela" name="parcel_enable_voice_channel_local"/> @@ -435,7 +435,7 @@ los media: Restringir el acceso a residentes verificados con: </text> <check_box label="Información de pago aportada [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/> - <check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Para más información, véase [SUPPORT_SITE]."/> + <check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/> <check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/> <check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/> <combo_box name="pass_combo"> diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml index b53b9a3889..089ff3cd68 100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml @@ -17,10 +17,10 @@ <texture_picker label="Alfa de la cabeza" name="head_alpha"/> <texture_picker label="Tatuaje de la cabeza" name="head_tattoo"/> <texture_picker label="Ojos" name="eyes-baked"/> - <texture_picker label="Oho" name="eyes_iris"/> + <texture_picker label="Ojo" name="eyes_iris"/> <texture_picker label="Alfa de los ojos" name="eyes_alpha"/> <texture_picker label="Parte superior del cuerpo" name="upper-baked"/> - <texture_picker label="Parte superior del cuerpo: bodypaint" name="upper_bodypaint"/> + <texture_picker label="Pintura corporal: parte superior del cuerpo" name="upper_bodypaint"/> <texture_picker label="Camiseta" name="upper_undershirt"/> <texture_picker label="Guantes" name="upper_gloves"/> <texture_picker label="Camisa" name="upper_shirt"/> @@ -28,7 +28,7 @@ <texture_picker label="Alfa superior" name="upper_alpha"/> <texture_picker label="Tatuaje superior" name="upper_tattoo"/> <texture_picker label="Parte inferior del cuerpo" name="lower-baked"/> - <texture_picker label="Parte inferior del cuerpo: bodypaint" name="lower_bodypaint"/> + <texture_picker label="Pintura corporal: parte inferior del cuerpo" name="lower_bodypaint"/> <texture_picker label="Ropa interior" name="lower_underpants"/> <texture_picker label="Calcetines" name="lower_socks"/> <texture_picker label="Zapatos" name="lower_shoes"/> diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml index 0d280320e2..81c54cf600 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml @@ -46,7 +46,7 @@ [AMT] L$ </text> <text name="currency_links"> - [http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de pago] + [http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de cambio] </text> <text name="exchange_rate_note"> Vuelve a escribir la cantidad para ver el tipo de cambio más reciente. diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml index 97191a1336..4b332cd9c3 100644 --- a/indra/newview/skins/default/xui/es/floater_customize.xml +++ b/indra/newview/skins/default/xui/es/floater_customize.xml @@ -35,7 +35,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una anatomía nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una anatomía nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este ítem. @@ -68,7 +68,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este ítem. @@ -105,7 +105,7 @@ Situado en [PATH] </text> <text name="not worn instructions"> - Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vístetelo. + Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien puedes crear uno nuevo partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este ítem. @@ -136,7 +136,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos. + Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este ítem. @@ -177,7 +177,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este ítem. @@ -210,7 +210,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos. + Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este ítem. @@ -236,7 +236,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos. + Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/> <text name="no modify instructions"> @@ -269,7 +269,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos. + Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New" width="185"/> <text name="no modify instructions"> @@ -302,7 +302,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/> <text name="no modify instructions"> @@ -336,7 +336,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos. + Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/> <text name="no modify instructions"> @@ -369,7 +369,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/> <text name="no modify instructions"> @@ -402,7 +402,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New" width="185"/> <text name="no modify instructions"> @@ -435,7 +435,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/> <text name="no modify instructions"> @@ -468,7 +468,7 @@ Situado en [PATH] </text> <text name="not worn instructions"> - Ponte un tatuaje nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vístetelo. + Pon un tatuaje nuevo arrastrándolo desde tu inventario a tu avatar. O bien puedes crear uno nuevo partiendo de cero. </text> <button label="Crear un tatuaje nuevo" label_selected="Crear un tatuaje nuevo" name="Create New"/> <text name="no modify instructions"> @@ -502,7 +502,7 @@ Situado en [PATH] </text> <text name="not worn instructions"> - Ponte una capa Alfa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela. + Pon una capa Alfa nueva arrastrándola desde tu inventario a tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <button label="Crear una capa Alfa nueva" label_selected="Crear una capa Alfa nueva" name="Create New"/> <text name="no modify instructions"> diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml index f2ce40e994..81909e997c 100644 --- a/indra/newview/skins/default/xui/es/floater_event.xml +++ b/indra/newview/skins/default/xui/es/floater_event.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Event" name="Event" title="DETALLES DEL EVENTO"> +<floater label="Evento" name="Event" title="DETALLES DEL EVENTO"> <floater.string name="none"> - Ninguno + ninguno </floater.string> <floater.string name="notify"> Notificar diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml index d87623c3df..e6b01a4946 100644 --- a/indra/newview/skins/default/xui/es/floater_im.xml +++ b/indra/newview/skins/default/xui/es/floater_im.xml @@ -10,7 +10,7 @@ Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz. </string> <string name="muted_message"> - Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje. + Has ignorado a este Residente. Enviándole un mensaje, automáticamente dejarás de ignorarle. </string> <string name="generic_request_error"> Error al hacer lo solicitado; por favor, inténtelo más tarde. diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml index 869babee44..9f9902a3a0 100644 --- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml @@ -3,7 +3,7 @@ <button label="Guardar" label_selected="Guardar" name="Save"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <text name="Save item as:"> - Guardar lo que estoy llevando + Guardar lo que llevo puesto como un vestuario nuevo: </text> <line_editor name="name ed"> diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml index 52c6593f75..e2a53693b5 100644 --- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml @@ -28,10 +28,10 @@ Has sido desconectado de [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> <text name="nearby_P2P_by_other"> - [VOICE_CHANNEL_NAME] ha finalizado la llamada. [RECONNECT_NEARBY] + [VOICE_CHANNEL_NAME] ha colgado la llamada. [RECONNECT_NEARBY] </text> <text name="nearby_P2P_by_agent"> - Has finalizado la llamada. [RECONNECT_NEARBY] + Has finalizado la llamada. [RECONNECT_NEARBY] </text> <text name="leaving"> Saliendo de [CURRENT_CHAT]. diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml index 095112dbdc..410f7b5e36 100644 --- a/indra/newview/skins/default/xui/es/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="scriptlimits" title="INFORMACIÓN DEl SCRIPT"/> +<floater name="scriptlimits" title="INFORMACIÓN DEL SCRIPT"/> diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml index d597926d39..6503a3d5cb 100644 --- a/indra/newview/skins/default/xui/es/floater_select_key.xml +++ b/indra/newview/skins/default/xui/es/floater_select_key.xml @@ -2,6 +2,6 @@ <floater name="modal container" title=""> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <text name="Save item as:"> - Pulsa una tecla para configurarla como botón de Apretar para Hablar. + Pulsa una tecla para configurarla como tu botón para hablar. </text> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml index 78d9b2a9c8..cbacce304c 100644 --- a/indra/newview/skins/default/xui/es/floater_tos.xml +++ b/indra/newview/skins/default/xui/es/floater_tos.xml @@ -4,7 +4,7 @@ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/> <text name="tos_heading"> - Por favor, lee cuidadosamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo. + Por favor, lee detenidamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo. </text> <text_editor name="tos_text"> TOS_TEXT diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml index d5708483e5..a8dc05703c 100644 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml @@ -6,77 +6,29 @@ </text> </panel> <panel> - <button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de mi avatar"/> <text name="me_label"> Yo </text> - <check_box label="Residente" name="people_chk"/> <text name="person_label"> Persona </text> - <check_box label="Punto de Info" name="infohub_chk"/> - <text name="infohub_label"> - Punto de Info - </text> - <check_box label="Terreno en venta" name="land_for_sale_chk"/> - <text name="land_sale_label"> - Venta de terreno - </text> <text name="by_owner_label"> por el propietario </text> <text name="auction_label"> subasta de terreno </text> - <button label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a mi Base"/> - <text name="Home_label"> - Base - </text> - <text name="events_label"> - Eventos: - </text> - <check_box label="'PG'" name="event_chk"/> <text name="pg_label"> General </text> - <check_box initial_value="true" label="'Mature'" name="event_mature_chk"/> <text name="mature_label"> Moderado </text> - <check_box label="'Adult'" name="event_adult_chk"/> <text name="adult_label"> Adulto </text> </panel> <panel> - <text name="find_on_map_label"> - Encontrar en el mapa - </text> - </panel> - <panel> - <combo_box label="Amigos conectados" name="friend combo" tool_tip="Ver a los amigos en el mapa"> - <combo_box.item label="Mis amigos conectados" name="item1"/> - </combo_box> - <combo_box label="Mis hitos" name="landmark combo" tool_tip="Hito a ver en el mapa"> - <combo_box.item label="Mis hitos" name="item1"/> - </combo_box> - <search_editor label="Regiones alfabéticamente" name="location" tool_tip="Escriba el nombre de una región"/> - <button label="Encontrar" name="DoSearch" tool_tip="Buscar una región"/> <button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/> - <scroll_list name="search_results"> - <scroll_list.columns label="" name="icon"/> - <scroll_list.columns label="" name="sim_name"/> - </scroll_list> - <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/> - <button label="Copiar la SLurl" name="copy_slurl" tool_tip="Copiar la SLurl de esta posición para usarla en una web."/> - <button label="Ver lo elegido" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/> - </panel> - <panel> - <text name="zoom_label"> - Zoom - </text> - </panel> - <panel> - <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml index 1004471025..46b6d3ece6 100644 --- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="Levantarse" name="Stand Up"/> - <context_menu label="Quitarse ▶" name="Take Off >"> + <context_menu label="Quitarme ▶" name="Take Off >"> <context_menu label="Ropas ▶" name="Clothes >"> <menu_item_call label="Camisa" name="Shirt"/> <menu_item_call label="Pantalón" name="Pants"/> diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index 1aa0a26ca8..602798b108 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -62,7 +62,7 @@ <menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/> <menu_item_call label="Escuchar" name="Sound Play"/> <menu_item_call label="Acerca del hito" name="About Landmark"/> - <menu_item_call label="Ejecutarla en el mundo" name="Animation Play"/> + <menu_item_call label="Escuchar en el mundo" name="Animation Play"/> <menu_item_call label="Ejecutarla para usted" name="Animation Audition"/> <menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/> <menu_item_call label="Ofrecer teleporte..." name="Offer Teleport..."/> diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml index 581ecd6698..18b6363bbb 100644 --- a/indra/newview/skins/default/xui/es/menu_object.xml +++ b/indra/newview/skins/default/xui/es/menu_object.xml @@ -7,12 +7,12 @@ <menu_item_call label="Sentarse aquí" name="Object Sit"/> <menu_item_call label="Perfil del objeto" name="Object Inspect"/> <menu_item_call label="Acercar el zoom" name="Zoom In"/> - <context_menu label="Ponerse ▶" name="Put On"> + <context_menu label="Ponerme ▶" name="Put On"> <menu_item_call label="Ponerse" name="Wear"/> <context_menu label="Anexar ▶" name="Object Attach"/> <context_menu label="Anexar como HUD ▶" name="Object Attach HUD"/> </context_menu> - <context_menu label="Quitarse ▶" name="Remove"> + <context_menu label="Quitarme ▶" name="Remove"> <menu_item_call label="Denunciar una infracción" name="Report Abuse..."/> <menu_item_call label="Ignorar" name="Object Mute"/> <menu_item_call label="Devolver" name="Return..."/> diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml index f4e7671a92..60c92eec75 100644 --- a/indra/newview/skins/default/xui/es/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Participant List Context Menu"> - <menu_item_check label="Ordenar según el nombre" name="SortByName"/> - <menu_item_check label="Ordenar según los intervinientes recientes" name="SortByRecentSpeakers"/> + <menu_item_check label="Ordenar alfabéticamente" name="SortByName"/> + <menu_item_check label="Ordenar según las intervenciones recientes" name="SortByRecentSpeakers"/> <menu_item_call label="Ver el perfil" name="View Profile"/> <menu_item_call label="Añadir como amigo" name="Add Friend"/> <menu_item_call label="MI" name="IM"/> @@ -11,10 +11,10 @@ <menu_item_check label="Ignorar la voz" name="Block/Unblock"/> <menu_item_check label="Ignorar el texto" name="MuteText"/> <context_menu label="Opciones del moderador >" name="Moderator Options"> - <menu_item_check label="Autorizar el chat de texto" name="AllowTextChat"/> - <menu_item_call label="Silenciar a este participante" name="ModerateVoiceMuteSelected"/> + <menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/> + <menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/> <menu_item_call label="Silenciar a todos los demás" name="ModerateVoiceMuteOthers"/> - <menu_item_call label="Designorar a este participante" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Designorar a todos los demás" name="ModerateVoiceUnMuteOthers"/> + <menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Quitar el silencio a todos los demás" name="ModerateVoiceUnMuteOthers"/> </context_menu> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml index 8342497525..51bd2c7208 100644 --- a/indra/newview/skins/default/xui/es/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Ver la información" name="View Info"/> <menu_item_call label="Chat" name="Chat"/> - <menu_item_call label="Llamada" name="Call"/> + <menu_item_call label="Llamar" name="Call"/> <menu_item_call label="Activar" name="Activate"/> <menu_item_call label="Dejar" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 61cefd7b76..9c08fbb2c8 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -9,7 +9,7 @@ <menu_item_call label="Mi perfil" name="Profile"/> <menu_item_call label="Mi apariencia" name="Appearance"/> <menu_item_check label="Mi Inventario" name="Inventory"/> - <menu_item_check label="Mi inventario" name="ShowSidetrayInventory"/> + <menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/> <menu_item_check label="Mis gestos" name="Gestures"/> <menu label="Mi estatus" name="Status"> <menu_item_call label="Ausente" name="Set Away"/> @@ -47,13 +47,13 @@ <menu_item_check label="Propiedades de la parcela" name="Parcel Properties"/> </menu> <menu_item_call label="Teleportar a la Base" name="Teleport Home"/> - <menu_item_call label="Fijar aquí mi Base" name="Set Home to Here"/> + <menu_item_call label="Fijar mi Base aquí" name="Set Home to Here"/> <menu label="Sol" name="Environment Settings"> <menu_item_call label="Amanecer" name="Sunrise"/> <menu_item_call label="Mediodía" name="Noon"/> <menu_item_call label="Atardecer" name="Sunset"/> <menu_item_call label="Medianoche" name="Midnight"/> - <menu_item_call label="Tiempo del Estado" name="Revert to Region Default"/> + <menu_item_call label="Hora del Estado" name="Revert to Region Default"/> <menu_item_call label="Editor del entorno" name="Environment Editor"/> </menu> </menu> @@ -100,7 +100,7 @@ <menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/> <menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/> <menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/> - <menu_item_check label="Sólo seleccionar los objetos movibles" name="Select Only Movable Objects"/> + <menu_item_check label="Seleccionar sólo los objetos movibles" name="Select Only Movable Objects"/> <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/> <menu_item_check label="Al seleccionar, mostrar lo oculto" name="Show Hidden Selection"/> <menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 0f64550725..d7f7fc4987 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -109,12 +109,12 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente. <usetemplate name="okbutton" yestext="Sí"/> </notification> <notification name="GrantModifyRights"> - Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso. + Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso. ¿Quieres conceder permisos de modificación a [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> <notification name="GrantModifyRightsMultiple"> - Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso. + Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso. ¿Quieres conceder permisos de modificación a los Residentes elegidos? <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> @@ -164,7 +164,7 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sí mi </notification> <notification name="AttachmentDrop"> Vas a soltar tu anexado. - ¿Quieres seguir? + ¿Estás seguro de que quieres continuar? <usetemplate ignoretext="Confirmar antes de soltar anexados" name="okcancelignore" notext="No" yestext="Sí"/> </notification> <notification name="JoinGroupCanAfford"> @@ -441,7 +441,7 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range& No se ha podido escribir el archivo [[FILE]] </notification> <notification name="UnsupportedHardware"> - Debes saber que tu ordenador no cumple los requirimientos mínimos para [APP_NAME]. Puede que experimentes un rendimiento muy bajo. Desafortunadamente, [SUPPORT_SITE] no puede dar asistencia técnica a sistemas con una configuración no admitida. + Debes saber que tu ordenador no cumple los requisitos mínimos para la utilización de [APP_NAME]. Puede que experimentes un rendimiento muy bajo. Desafortunadamente, [SUPPORT_SITE] no puede dar asistencia técnica a sistemas con una configuración no admitida. MINSPECS ¿Ir a [_URL] para más información? @@ -452,7 +452,7 @@ MINSPECS </notification> <notification name="UnknownGPU"> Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce. -Esto suele suceder con hardware nuevo que aun no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas. +Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas. (Yo > Preferencias > Gráficos). <form name="form"> <ignore name="ignore" text="No se ha podido identificar mi tarjeta gráfica"/> @@ -734,7 +734,7 @@ no se ha seleccionado una parcela. No se ha podido obtener la propiedad del terreno porque la selección se extiende por varias regiones. Por favor, seleccione un área más pequeña y reinténtelo. </notification> <notification name="ForceOwnerAuctionWarning"> - Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ha empezado. + Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ya ha empezado. ¿Forzar la propiedad? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> @@ -904,7 +904,7 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela. Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el ítem de aquí a unos minutos. </notification> <notification name="YouHaveBeenLoggedOut"> - Vaya, has sido desconectado de [SECOND_LIFE] + Vaya, se te ha cerrado la sesión en [SECOND_LIFE] [MESSAGE] <usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/> </notification> @@ -1347,7 +1347,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue <usetemplate name="okcancelbuttons" notext="Rehusar" yestext="Entrar"/> </notification> <notification name="JoinedTooManyGroups"> - Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de crear uno nuevo o entrar en alguno. + Has superado tu número máximo de grupos. Por favor, sal de al menos uno de ellos antes de crear uno nuevo o entrar en alguno. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="KickUser"> @@ -1615,7 +1615,7 @@ Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferen </notification> <notification label="Cambiada la calificación de la región" name="RegionMaturityChange"> Se ha actualizado el nivel de calificación de esta región. -Llevará algún tiempo que el cambio se refleje en el mapa. +Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa. Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago. </notification> @@ -1735,7 +1735,7 @@ Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar u <usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones del Servicio] y las [http://secondlife.com/corporate/cs.php Normas de la Comunidad]. + Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones de Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad]. Se investigan y resuelven todas las infracciones denunciadas. </notification> @@ -2062,7 +2062,7 @@ Pulsa en un hito para seleccionarlo, y, luego, pulsa 'Teleportar' en l </notification> <notification name="TeleportToPerson"> Puedes contactar con un Residente como '[NAME]' abriendo el panel Gente en el lado derecho de tu pantalla. -Elige al Residente de la lista y pulsa 'MI' en la parte superior del panel. +Elige al Residente de la lista y pulsa 'MI' en la parte inferior del panel. (También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir 'MI'). </notification> <notification name="CantSelectLandFromMultipleRegions"> diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml index 7c11b3d193..cddbad1195 100644 --- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml @@ -6,5 +6,5 @@ <scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/> <button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/> <button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/> - <button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quitar al Residente o al objeto de la lista de ignorados"/> + <button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml index 0dc22c107b..e1cac7c2c3 100644 --- a/indra/newview/skins/default/xui/es/panel_friends.xml +++ b/indra/newview/skins/default/xui/es/panel_friends.xml @@ -16,5 +16,5 @@ <button label="Teleporte" name="offer_teleport_btn" tool_tip="Ofrecer a este amigo teleportarle hasta su posición"/> <button label="Pagar" name="pay_btn" tool_tip="Dar dólares Linden (L$) a este amigo"/> <button label="Quitar" name="remove_btn" tool_tip="Quitar a esta persona de su lista de amigos"/> - <button label="Añadir" name="add_btn" tool_tip="Ofrece amistad a un Residente"/> + <button label="Añadir" name="add_btn" tool_tip="Ofrecer amistad a un Residente"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml index 82123016b1..b398293175 100644 --- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml @@ -5,7 +5,7 @@ <button label="Perfil del grupo" name="group_info_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> - <button label="Llamada de grupo" name="call_btn"/> + <button label="Llamar al grupo" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Colgar" name="end_call_btn"/> diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml index 2a64464fd9..0d877f78f2 100644 --- a/indra/newview/skins/default/xui/es/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml @@ -14,7 +14,7 @@ </text> <button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/> <name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Para seleccionar a varios residentes, ve pulsando sus nombres mientras mantienes apretada la tecla Ctrl"/> - <button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quita de la lista a los Residentes seleccionados arriba" width="214"/> + <button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quitar de la lista a los Residentes seleccionados arriba" width="214"/> <text name="role_text"> Elegir qué rol asignarles: </text> diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml index 0e4288f772..b763e2e74d 100644 --- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml @@ -54,7 +54,7 @@ Se necesitan más créditos de terreno para mantener el terreno en uso </text> <text name="group_money_heading"> - L$ del grupp + L$ del grupo </text> </panel> <tab_container name="group_money_tab_container"> diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml index f4a6839156..58e1919782 100644 --- a/indra/newview/skins/default/xui/es/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml @@ -36,7 +36,7 @@ El máximo es de 200 por día y grupo. <text name="string"> Arrastra y suelta aquí un ítem para adjuntarlo: </text> - <button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quitar el adjunto de tu aviso"/> + <button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quita el adjunto de tu aviso"/> <button label="Enviar" label_selected="Enviar" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Para enviar un ítem con el aviso, arrástralo desde tu inventario hasta este cajetín. Para poder adjuntarlo, debes tener permiso para copiarlo y transferirlo."/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml index 384864cba4..5ef81162bc 100644 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml @@ -6,22 +6,22 @@ <panel.string name="want_apply_text"> ¿Quieres guardar estos cambios? </panel.string> - <tab_container height="164" name="roles_tab_container"> - <panel height="148" label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros"> + <tab_container name="roles_tab_container"> + <panel label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros"> <panel.string name="help_text"> Puede añadir o quitar los roles asignados a los miembros. Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos. </panel.string> <filter_editor label="Filtrar los miembros" name="filter_input"/> - <name_list bottom_delta="-105" height="104" name="member_list"> + <name_list name="member_list"> <name_list.columns label="Miembro" name="name"/> <name_list.columns label="Donaciones" name="donated"/> <name_list.columns label="Estatus" name="online"/> </name_list> - <button label="Invitar" name="member_invite" width="175"/> + <button label="Invitar" name="member_invite"/> <button label="Expulsar" name="member_eject"/> </panel> - <panel height="148" label="ROLES" name="roles_sub_tab"> + <panel label="ROLES" name="roles_sub_tab"> <panel.string name="help_text"> Los roles tienen una etiqueta propia y unas capacidades que se permiten ejercer a sus miembros. Los miembros pueden @@ -35,7 +35,7 @@ incluyendo el de Todos y el de Propietarios. Inv_FolderClosed </panel.string> <filter_editor label="Filtrar los roles" name="filter_input"/> - <scroll_list bottom_delta="-104" height="104" name="role_list"> + <scroll_list name="role_list"> <scroll_list.columns label="Rol" name="name"/> <scroll_list.columns label="Etiqueta" name="title"/> <scroll_list.columns label="#" name="members"/> diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml index 09969a796c..c3d5b017ad 100644 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml @@ -8,7 +8,7 @@ <button label="Añadir como amigo" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> + <button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> </layout_panel> <layout_panel name="share_btn_panel"> <button label="Compartir" name="share_btn"/> diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml index 8fe3144d05..46326d1e8b 100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml @@ -4,16 +4,16 @@ Página inicial: </text> <text name="home_fails_whitelist_label"> - (Esta página no supera la lista blanca especificada) + (La Lista Blanca especificada no aprueba esta página) </text> - <line_editor name="home_url" tool_tip="La página inicial para el origen de este media"/> + <line_editor name="home_url" tool_tip="Página inicial para el origen de este media"/> <text name="preview_label"> Vista previa </text> <text name="current_url_label"> Página actual: </text> - <text name="current_url" tool_tip="La página actual para el origen de este media" value=""/> + <text name="current_url" tool_tip="Página actual para el origen de este media" value=""/> <button label="Definir" name="current_url_reset_btn"/> <check_box initial_value="false" label="Media en bucle" name="auto_loop"/> <check_box initial_value="false" label="A la primera pulsación" name="first_click_interact"/> diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml index 4b4fff5edb..c72f562a68 100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml @@ -2,11 +2,11 @@ <panel label="Seguridad" name="Media Settings Security"> <check_box initial_value="false" label="Permitir el acceso sólo a los patrones de URL especificados" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - Las entradas contra las que falle la página inicial se marcan: + Están marcadas las entradas que la página web no admite: </text> <button label="Añadir" name="whitelist_add"/> <button label="Borrar" name="whitelist_del"/> <text name="home_url_fails_whitelist"> - Atención: la página inicial especificada en la pestaña General no supera esta lista blanca. Se ha desactivado hasta que se añada una entrada válida. + Atención: la página web especificada en la pestaña General no se admite en esta lista blanca. Se ha desactivado hasta que se añada una entrada correcta. </text> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_my_profile.xml b/indra/newview/skins/default/xui/es/panel_my_profile.xml index 6c00a05d12..5a6fd8b144 100644 --- a/indra/newview/skins/default/xui/es/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_my_profile.xml @@ -28,8 +28,8 @@ </scroll_container> </layout_panel> <layout_panel name="profile_me_buttons_panel"> - <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/> - <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu físico, ropas, etc."/> + <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/> + <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu físico, ropas, etc."/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml index 6c6e4c7ee8..e8e95c3bac 100644 --- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml @@ -9,7 +9,7 @@ <combo_editor label="Buscar en [SECOND_LIFE]" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite" tool_tip="Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquí"> + <favorites_bar name="favorite" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquí!"> <label name="favorites_bar_label" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquí!"> Barra de Favoritos </label> diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml index cd8836f40f..885c780e00 100644 --- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml @@ -13,9 +13,9 @@ (ejecutándose) </string> <panel name="minimized_controls"> - <button label="Para todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/> + <button label="Parar todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/> <button label="Iniciar todo" name="all_nearby_media_enable_btn" tool_tip="Encender todos los media cercanos"/> - <button name="open_prefs_btn" tool_tip="Abre las preferencias de los media"/> + <button name="open_prefs_btn" tool_tip="Abrir las preferencias de los media"/> <button label="Más >>" label_selected="Menos <<" name="more_less_btn" tool_tip="Controles avanzados"/> </panel> <panel name="nearby_media_panel"> @@ -29,24 +29,24 @@ <scroll_list.columns label="Visibilidad" name="media_visibility"/> <scroll_list.columns label="Clase" name="media_class"/> <scroll_list.columns label="Nombre" name="media_name"/> - <scroll_list.columns label="Limpiar" name="media_debug"/> + <scroll_list.columns label="Depurar" name="media_debug"/> </scroll_list> <panel> <layout_stack name="media_controls"> <layout_panel name="stop"> - <button name="stop_btn" tool_tip="Para los media seleccionados"/> + <button name="stop_btn" tool_tip="Parar los media seleccionados"/> </layout_panel> <layout_panel name="play"> - <button name="play_btn" tool_tip="Ejecuta los media seleccionados"/> + <button name="play_btn" tool_tip="Ejecutar los media seleccionados"/> </layout_panel> <layout_panel name="pause"> - <button name="pause_btn" tool_tip="Pausa los media seleccionados"/> + <button name="pause_btn" tool_tip="Pausar los media seleccionados"/> </layout_panel> <layout_panel name="volume_slider_ctrl"> <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen de los media seleccionados"/> </layout_panel> <layout_panel name="mute"> - <button name="mute_btn" tool_tip="Silencia el audio de los media seleccionados"/> + <button name="mute_btn" tool_tip="Silenciar el audio de los media seleccionados"/> </layout_panel> <layout_panel name="zoom"> <button name="zoom_btn" tool_tip="Zoom en los media seleccionados"/> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml index 11bbcd7695..2f60df7743 100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml @@ -6,9 +6,9 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Ver más opciones"/> - <dnd_button name="trash_btn" tool_tip="Quita el ítem seleccionado"/> - <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guarda la apariencia como un vestuario"/> - <button label="Llevar" name="wear_btn" tool_tip="Viste el vestuario seleccionado"/> + <dnd_button name="trash_btn" tool_tip="Quitar el ítem seleccionado"/> + <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guardar la apariencia como un vestuario"/> + <button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/> <button label="M" name="look_edit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml index 001446be21..03c449da93 100644 --- a/indra/newview/skins/default/xui/es/panel_people.xml +++ b/indra/newview/skins/default/xui/es/panel_people.xml @@ -12,7 +12,7 @@ <panel label="CERCANÍA" name="nearby_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="nearby_view_sort_btn" tool_tip="Opciones"/> - <button name="add_friend_btn" tool_tip="Añade al Residente seleccionado a la lista de tus amigos"/> + <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/> </panel> </panel> <panel label="MIS AMIGOS" name="friends_panel"> @@ -22,7 +22,7 @@ </accordion> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Opciones"/> - <button name="add_btn" tool_tip="Ofrece amistad a un Residente"/> + <button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/> <button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/> </panel> <text name="no_friends_msg"> @@ -40,18 +40,18 @@ Si estás buscando gente para pasar el rato, [secondlife:///app/worldmap usa el <panel label="RECIENTE" name="recent_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="recent_viewsort_btn" tool_tip="Opciones"/> - <button name="add_friend_btn" tool_tip="Añade al Residente seleccionado a la lista de tus amigos"/> + <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/> </panel> </panel> </tab_container> <panel name="button_bar"> - <button label="Perfil" name="view_profile_btn" tool_tip="Muestra imágenes, grupos y otra información del Residente"/> + <button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/> <button label="MI" name="im_btn" tool_tip="Abrir un mensaje instantáneo"/> <button label="Llamada" name="call_btn" tool_tip="Llamar a este Residente"/> <button label="Compartir" name="share_btn"/> <button label="Teleportarse" name="teleport_btn" tool_tip="Ofrecer teleporte"/> <button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/> <button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/> - <button label="Multiconferencia" name="group_call_btn" tool_tip="Llama a este grupo"/> + <button label="Multiconferencia" name="group_call_btn" tool_tip="Llamar a este grupo"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml index 9d4a958e16..2c873ef464 100644 --- a/indra/newview/skins/default/xui/es/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml @@ -49,7 +49,7 @@ <text name="maturity_value" value="desconocido"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parcela"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Calificación:"/> <text name="rating_value" value="desconocida"/> <text name="voice_label" value="Voz:"/> @@ -68,7 +68,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Región"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Región:"/> <text name="region_type_label" value="Tipo:"/> <text name="region_rating_label" value="Calificación:"/> @@ -78,7 +78,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Estado"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Estado:"/> <text name="estate_rating_label" value="Calificación:"/> <text name="estate_owner_label" value="Propietario:"/> @@ -86,7 +86,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="En venta"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Precio:"/> <text name="area_label" value="Área:"/> <text name="traffic_label" value="Tráfico:"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml index b8010e0a35..17e3b45beb 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat de texto" name="chat"> + <text name="font_size"> + Font size: + </text> <radio_group name="chat_font_size"> <radio_item label="Disminuir" name="radio" value="0"/> <radio_item label="Media" name="radio2" value="1"/> <radio_item label="Aumentar" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Font colors: + </text> <color_swatch label="Usted" name="user"/> <text name="text_box1"> Yo diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index a08e5194e8..3632ecca7b 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> Conéctate para que cambie </panel.string> - <button label="Limpiar el historial" name="clear_cache" tool_tip="Limpiar la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/> + <button label="Limpiar el historial" name="clear_cache" tool_tip="Limpia la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/> <text name="cache_size_label_l"> (Localizaciones, imágenes, web, historial de búsqueda) </text> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml index 68ca63d85f..ebf2b1084b 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml @@ -18,7 +18,7 @@ kbps </text> <check_box label="Personalizar el puerto" name="connection_port_enabled"/> - <spinner label="Número del puerto:" name="connection_port"/> + <spinner label="Número de puerto:" name="connection_port"/> <text name="cache_size_label_l"> Tamaño de la caché </text> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index 053fb00967..9e6cf49247 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -11,8 +11,8 @@ <check_box label="Activados" name="enable_media"/> <slider label="Chat de voz" name="Voice Volume"/> <check_box label="Activada" name="enable_voice_check"/> - <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marca esto para permitir la ejecución automática de los media" value="Sí"/> - <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Desmarcar esto esconderá los media anexados a otros avatares cercanos" value="Sí"/> + <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="Sí"/> + <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="Sí"/> <text name="voice_chat_settings"> Configuración del chat de voz </text> diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml index 037aae2e43..174922e28e 100644 --- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml @@ -14,7 +14,7 @@ </string> <layout_stack name="progress_indicator_area"> <panel name="media_progress_indicator"> - <progress_bar name="media_progress_bar" tool_tip="El media se está cargando"/> + <progress_bar name="media_progress_bar" tool_tip="Los media se están cargando"/> </panel> </layout_stack> <layout_stack name="media_controls"> @@ -28,7 +28,7 @@ <button name="home_btn" tool_tip="Página inicial"/> </layout_panel> <layout_panel name="media_stop"> - <button name="media_stop_btn" tool_tip="Para los media"/> + <button name="media_stop_btn" tool_tip="Parar los media"/> </layout_panel> <layout_panel name="reload"> <button name="reload_btn" tool_tip="Recargar"/> @@ -67,7 +67,7 @@ <slider name="volume_slider" tool_tip="Volumen de los media"/> </layout_panel> <layout_panel name="zoom_frame"> - <button name="zoom_frame_btn" tool_tip="Zoom a la mitad"/> + <button name="zoom_frame_btn" tool_tip="Zoom hacia los media"/> </layout_panel> <layout_panel name="close"> <button name="close_btn" tool_tip="Alejar el zoom"/> diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml index 6347c0e047..d725bfe618 100644 --- a/indra/newview/skins/default/xui/es/panel_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_profile.xml @@ -42,11 +42,11 @@ <button label="Llamar" name="call" tool_tip="Llamar a este Residente"/> <button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/> <button label="Teleportar" name="teleport" tool_tip="Ofrecer teleporte"/> - <button label="▼" name="overflow_btn" tool_tip="Pagar dinero o dar algo del inventario con el Residente"/> + <button label="▼" name="overflow_btn" tool_tip="Pagar dinero al Residente o compartir algo del inventario con él"/> </layout_panel> <layout_panel name="profile_me_buttons_panel"> - <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/> - <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu físico, ropas, etc."/> + <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/> + <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu físico, ropas, etc."/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index 1a230166fb..53d05cf2c9 100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml @@ -25,8 +25,8 @@ <text name="Only Allow"> Restringir el acceso a cuentas verificadas por: </text> - <check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsar a los Residentes no identificados."/> - <check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Para más información, véase [SUPPORT_SITE].."/> + <check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/> + <check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/> <check_box label="Permitir el chat de voz" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/> diff --git a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml index 827898973a..89ad5549c8 100644 --- a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml @@ -4,13 +4,13 @@ Región: </text> <text name="region_text"> - desconocido + desconocida </text> <text name="version_channel_text_lbl"> Versión: </text> <text name="version_channel_text"> - desconocido + desconocida </text> <text name="region_type_lbl"> Tipo: @@ -24,7 +24,7 @@ <check_box label="Impedir los 'empujones'" name="restrict_pushobject"/> <check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/> <check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/> - <check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/> + <check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permite que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/> <spinner label="Nº máximo de avatares" name="agent_limit_spin"/> <spinner label="Plus de objetos" name="object_bonus_spin"/> <text label="Calificación" name="access_text"> diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml index ecca21e672..83c22d20eb 100644 --- a/indra/newview/skins/default/xui/es/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml @@ -48,7 +48,7 @@ Estos valores representan la gama de mezclas para las texturas superiores. </text> <text name="height_text_lbl11"> - Midiendo en metros, el valor BAJO es la altura MÁXIMA de la textura #1, y el valor ALTO es la altura MÍNIMA de la textura #4. + Midiendo en metros, el valor BAJA es la altura MÁXIMA de la textura #1, y el valor ALTA es la altura MÍNIMA de la textura #4. </text> <text name="height_text_lbl12"> y el valor ALTA es la altura MÍNIMA de la textura #4. diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml index 4226744ae9..d4404fd9b5 100644 --- a/indra/newview/skins/default/xui/es/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml @@ -26,6 +26,6 @@ <text name="TimeText" tool_tip="Hora actual (Pacífico)"> 24:00 AM PST </text> - <button name="media_toggle_btn" tool_tip="Inicia/Detiene todos los media (música, vídeo, páginas web)"/> + <button name="media_toggle_btn" tool_tip="Iniciar/Parar todos los media (música, vídeo, páginas web)"/> <button name="volume_btn" tool_tip="Control general del volumen"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml index 479af3f2bf..10b37b6880 100644 --- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="teleport_history_item"> - <button name="profile_btn" tool_tip="Muestra la información del ítem"/> + <button name="profile_btn" tool_tip="Mostrar la información del ítem"/> </panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml index ceb6e521cd..0d2eb0ac35 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml @@ -52,7 +52,7 @@ <text name="GroupLabel"> Grupo: </text> - <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles."/> + <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/> <text name="NextOwnerLabel"> Próximo propietario: </text> diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml index 6bfdbea2bc..0cd3b40ca6 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml @@ -39,37 +39,15 @@ <text name="title" value="Perfil del objeto"/> <text name="where" value="(en el mundo)"/> <panel label=""> - <text name="Name:"> - Nombre: - </text> - <text name="Description:"> - Descripción: - </text> <text name="CreatorNameLabel"> Creador: </text> <text name="Creator Name"> Erica Linden </text> - <text name="Owner:"> - Propietario: - </text> <text name="Group_label"> Grupo: </text> - <button name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/> - <name_box initial_value="Cargando..." name="Group Name Proxy"/> - <button label="Transfeir" label_selected="Transfeir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/> - <text name="label click action"> - Al tocarlo: - </text> - <combo_box name="clickaction"> - <combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/> - <combo_box.item label="Sentarme en el objeto" name="Sitonobject"/> - <combo_box.item label="Comprar el objeto" name="Buyobject"/> - <combo_box.item label="Pagar al objeto" name="Payobject"/> - <combo_box.item label="Abrir" name="Open"/> - </combo_box> <panel name="perms_inv"> <text name="perm_modify"> Puedes modificar este objeto @@ -82,7 +60,7 @@ <text name="GroupLabel"> Grupo: </text> - <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles"/> + <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/> <text name="NextOwnerLabel"> Próximo propietario: </text> @@ -91,13 +69,6 @@ <check_box label="Transferirlo" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> </panel> <check_box label="En venta" name="checkbox for sale"/> - <combo_box name="sale type"> - <combo_box.item label="Copiarlo" name="Copy"/> - <combo_box.item label="Contenidos" name="Contents"/> - <combo_box.item label="Original" name="Original"/> - </combo_box> - <spinner label="Precio: L$" name="Edit Cost"/> - <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objetos en los resultados de la búsqueda"/> <text name="B:"> B: </text> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 29486faa15..619094bbfa 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -804,7 +804,7 @@ Pulsa ESC para salir de la vista subjetiva </string> <string name="InventoryNoMatchingItems"> - No se han encontrado ítems en el inventario. Intenta con [secondlife:///app/search/groups "Buscar"]. + No se han encontrado tales ítems en el inventario. Intenta con [secondlife:///app/search/groups "Buscar"]. </string> <string name="FavoritesNoMatchingItems"> Arrastra aquí un hito para tenerlo en tus favoritos. @@ -1268,13 +1268,13 @@ todos los estados que administras para [OWNER] </string> <string name="RegionInfoAllowedResidents"> - Resientes autorizados: ([ALLOWEDAGENTS] de un máx. de [MAXACCESS]) + Resientes autorizados: ([ALLOWEDAGENTS], de un máx. de [MAXACCESS]) </string> <string name="RegionInfoAllowedGroups"> Grupos autorizados: ([ALLOWEDGROUPS], de un máx. de [MAXACCESS]) </string> <string name="ScriptLimitsParcelScriptMemory"> - Memoria de los script en la parcela + Memoria de los scripts de la parcela </string> <string name="ScriptLimitsParcelsOwned"> Parcelas listadas: [PARCELS] @@ -1319,10 +1319,10 @@ Cabeza </string> <string name="ATTACH_LSHOULDER"> - Hombro izq. + Hombro izquierdo </string> <string name="ATTACH_RSHOULDER"> - Hombro der. + Hombro derecho </string> <string name="ATTACH_LHAND"> Mano izq. @@ -1337,7 +1337,7 @@ Pie der. </string> <string name="ATTACH_BACK"> - Espalda + Anterior </string> <string name="ATTACH_PELVIS"> Pelvis @@ -1397,10 +1397,10 @@ Vientre </string> <string name="ATTACH_RPEC"> - Pecho der. + Pecho derecho </string> <string name="ATTACH_LPEC"> - Pecho izq. + Pecho izquierdo </string> <string name="ATTACH_HUD_CENTER_2"> HUD: Centro 2 @@ -1471,7 +1471,7 @@ (se actualizará tras la publicación) </string> <string name="NoPicksClassifiedsText"> - No has creado destacados o clasificados. Pulsa el botón Más para crear uno. + No has creado destacados ni clasificados. Pulsa el botón Más para crear uno. </string> <string name="NoAvatarPicksClassifiedsText"> El usuario no tiene clasificados ni destacados @@ -3187,7 +3187,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. (Moderador) </string> <string name="started_call"> - Iniciar una llamada de voz + Llamada de voz iniciada </string> <string name="joined_call"> Entrando a la llamada de voz @@ -3199,7 +3199,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. Conectado, pulsa Colgar para salir </string> <string name="hang_up-im"> - Colgar la llamada de voz + Se colgó la llamada de voz </string> <string name="only_user_message"> Usted es el único usuario en esta sesión. @@ -3211,7 +3211,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz. </string> <string name="muted_message"> - Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje. + Has ignorado a este residente. Enviándole un mensaje, automáticamente dejarás de ignorarle. </string> <string name="generic"> Error en lo solicitado, por favor, inténtalo más tarde. diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 309c93cf3b..558551b649 100644 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Déplacer la caméra vers le haut et le bas, la gauche et la droite </floater.string> + <floater.string name="orbit_mode_title"> + Faire tourner + </floater.string> + <floater.string name="pan_mode_title"> + Faire un panoramique + </floater.string> + <floater.string name="avatar_view_mode_title"> + Préréglages + </floater.string> + <floater.string name="free_mode_title"> + Voir l'objet + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/> <panel name="zoom" tool_tip="Zoomer en direction du point central"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="Faire tourner la caméra"/> <button label="" name="pan_btn" tool_tip="Faire un panoramique"/> - <button label="" name="avatarview_btn" tool_tip="Vue subjective"/> + <button label="" name="avatarview_btn" tool_tip="Préréglages"/> <button label="" name="freecamera_btn" tool_tip="Voir l'objet"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml index 02192c65ec..b005ce3b36 100644 --- a/indra/newview/skins/default/xui/fr/floater_event.xml +++ b/indra/newview/skins/default/xui/fr/floater_event.xml @@ -9,6 +9,18 @@ <floater.string name="dont_notify"> Ne pas prévenir </floater.string> + <floater.string name="moderate"> + Modéré + </floater.string> + <floater.string name="adult"> + Adulte + </floater.string> + <floater.string name="general"> + Général + </floater.string> + <floater.string name="unknown"> + Inconnu + </floater.string> <layout_stack name="layout"> <layout_panel name="profile_stack"> <text name="event_name"> @@ -21,12 +33,21 @@ Organisé par : </text> <text initial_value="(récupération en cours)" name="event_runby"/> + <text name="event_date_label"> + Date : + </text> <text name="event_date"> 10/10/2010 </text> + <text name="event_duration_label"> + Durée : + </text> <text name="event_duration"> 1 heure </text> + <text name="event_covercharge_label"> + Prix : + </text> <text name="event_cover"> Gratuit </text> diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml index 0e8887bb96..fac569557e 100644 --- a/indra/newview/skins/default/xui/fr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> Voler vers l'arrière (appuyer sur la flèche vers le bas ou S) </string> + <string name="walk_title"> + Marcher + </string> + <string name="run_title"> + Courir + </string> + <string name="fly_title"> + Voler + </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche (appuyer sur la flèche de gauche ou sur A)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite (appuyer sur la flèche de droite ou sur D)"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="Mode marche"/> <button label="" name="mode_run_btn" tool_tip="Mode course"/> <button label="" name="mode_fly_btn" tool_tip="Mode vol"/> - <button label="Atterrir" name="stop_fly_btn" tool_tip="Atterrir"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index 54ba2ad3e5..1a7bc228fa 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml @@ -16,6 +16,9 @@ Il n'y a personne près de vous avec le chat vocal activé </string> <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Mon avatar :"/> + </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="Quitter l'appel" name="leave_call_btn"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml index 1a74017330..6d697b40d3 100644 --- a/indra/newview/skins/default/xui/fr/floater_water.xml +++ b/indra/newview/skins/default/xui/fr/floater_water.xml @@ -10,7 +10,7 @@ <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/> <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Paramètres" name="Settings"> + <panel label="PARAMÈTRES" name="Settings"> <text name="BHText"> Couleur du brouillard dans l'eau </text> @@ -43,7 +43,7 @@ Multiplicateur de flou </text> </panel> - <panel label="Image" name="Waves"> + <panel label="IMAGE" name="Waves"> <text name="BHText"> Direction grande vague </text> diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml index d92fadd048..9f93302b71 100644 --- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml @@ -6,9 +6,9 @@ <button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/> <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/> <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/> - <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_pad="20" left_delta="95" name="WLDayCycleMenuButton" width="150"/> + <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/> <tab_container name="WindLight Tabs" width="706"> - <panel label="Atmosphère" name="Atmosphere"> + <panel label="ATMOSPHÈRE" name="Atmosphere"> <text name="BHText"> Bleu de l'horizon </text> @@ -62,7 +62,7 @@ </text> <button label="?" name="WLMaxAltitudeHelp"/> </panel> - <panel label="Éclairage" name="Lighting"> + <panel label="LUMIÈRE" name="Lighting"> <text name="SLCText"> Couleur soleil/lune </text> @@ -118,7 +118,7 @@ </text> <button label="?" name="WLStarBrightnessHelp"/> </panel> - <panel label="Nuages" name="Clouds"> + <panel label="NUAGES" name="Clouds"> <text name="WLCloudColorText"> Couleur des nuages </text> diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 1837be9c5d..6492a83e06 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -5,6 +5,7 @@ <menu_item_call label="Construire" name="Build"/> <menu_item_call label="Ouvrir" name="Open"/> <menu_item_call label="M'asseoir ici" name="Object Sit"/> + <menu_item_call label="Me lever" name="Object Stand Up"/> <menu_item_call label="Profil de l'objet" name="Object Inspect"/> <menu_item_call label="Zoomer en avant" name="Zoom In"/> <context_menu label="Porter ▶" name="Put On"> @@ -18,6 +19,7 @@ <menu_item_call label="Retour" name="Return..."/> <menu_item_call label="Supprimer" name="Delete"/> </context_menu> + <menu_item_call label="Acheter" name="Pie Object Bye"/> <menu_item_call label="Prendre" name="Pie Object Take"/> <menu_item_call label="Prendre une copie" name="Take Copy"/> <menu_item_call label="Payer" name="Pay..."/> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml index 08a97ee403..26bd3978a9 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml @@ -5,6 +5,7 @@ <menu_item_call label="Supprimer cet ami" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Appeler" name="Call"/> + <menu_item_call label="Carte" name="Map"/> <menu_item_call label="Partager" name="Share"/> <menu_item_call label="Payer" name="Pay"/> <menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index c54a4341f1..5925d28565 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -43,6 +43,8 @@ <menu_item_check label="Balises" name="beacons"/> <menu_item_check label="Limites du terrain" name="Property Lines"/> <menu_item_check label="Propriétaires de terrains" name="Land Owners"/> + <menu_item_check label="Coordonnées" name="Coordinates"/> + <menu_item_check label="Propriétés de la parcelle" name="Parcel Properties"/> </menu> <menu_item_call label="Me téléporter chez moi" name="Teleport Home"/> <menu_item_call label="Définir le domicile ici" name="Set Home to Here"/> @@ -81,7 +83,8 @@ <menu_item_call label="Point central sur la sélection" name="Focus on Selection"/> <menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/> <menu label="Objet" name="Object"> - <menu_item_call label="Acheter" name="Menu Object Take"/> + <menu_item_call label="Acheter" name="Menu Object Buy"/> + <menu_item_call label="Prendre" name="Menu Object Take"/> <menu_item_call label="Prendre une copie" name="Take Copy"/> <menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/> <menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/> @@ -149,7 +152,6 @@ <menu_item_check label="Alpha" name="Alpha"/> <menu_item_check label="Arbre" name="Tree"/> <menu_item_check label="Avatars" name="Character"/> - <menu_item_check label="SurfacePath" name="Surface"/> <menu_item_check label="Ciel" name="Sky"/> <menu_item_check label="Eau" name="Water"/> <menu_item_check label="Sol" name="Ground"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 28f9f9e52c..7d2a33509b 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -445,9 +445,8 @@ L'objet est peut-être inaccessible ou a peut-être été supprimé. Impossible d'écrire le fichier [[FILE]] </notification> <notification name="UnsupportedHardware"> - Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d'être médiocres. Malheureusement, la page [SUPPORT_SITE] n’offre aucune assistance pour les problèmes de configuration système. + Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d'être médiocres. Malheureusement, la section [SUPPORT_SITE] n'offre aucune aide pour les problèmes de configuration système. -MINSPECS Consulter [_URL] pour en savoir plus ? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=fr @@ -2335,6 +2334,12 @@ Veuillez réessayer dans quelques minutes. <notification name="FriendshipDeclined"> [NAME] a refusé votre amitié. </notification> + <notification name="FriendshipAcceptedByMe"> + Amitié acceptée. + </notification> + <notification name="FriendshipDeclinedByMe"> + Amitié refusée. + </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] vous offre sa carte de visite. Cela ajoute un marque-page dans votre inventaire, ce qui vous permet d'envoyer rapidement un IM à ce résident. @@ -2543,7 +2548,7 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité. </notification> <notification name="ConfirmCloseAll"> Êtes-vous certain de vouloir fermer tous les IM ? - <usetemplate name="okcancelignore" notext="Annuler" yestext="OK"/> + <usetemplate ignoretext="Confirmer avant de fermer tous les IM." name="okcancelignore" notext="Annuler" yestext="OK"/> </notification> <notification name="AttachmentSaved"> L'élément joint a été sauvegardé. diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml index 7fc10833ea..e1eeaa8601 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml @@ -15,10 +15,10 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to <filter_editor label="Filtrer les membres" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Membre" name="name"/> - <name_list.columns label="Donation" name="donated" width="116"/> - <name_list.columns label="Statut" name="online" width="136"/> + <name_list.columns label="Donation" name="donated"/> + <name_list.columns label="Statut" name="online"/> </name_list> - <button label="Inviter" name="member_invite" width="165"/> + <button label="Inviter" name="member_invite"/> <button label="Expulser" name="member_eject"/> </panel> <panel label="RÔLES" name="roles_sub_tab"> @@ -47,7 +47,7 @@ notamment les rôles Tous et Propriétaire. <scroll_list.columns label="#" name="members"/> </scroll_list> <button label="Nouveau rôle" name="role_create"/> - <button label="Supprimer le rôle" name="role_delete" width="120"/> + <button label="Supprimer le rôle" name="role_delete"/> </panel> <panel height="148" label="POUVOIRS" name="actions_sub_tab" tool_tip="Vous pouvez afficher une description du pouvoir et voir quels membres et rôles peuvent s'en servir."> <panel.string name="help_text"> diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml index 115e25e487..1f2169e22c 100644 --- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="Partager" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Payer" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index 84749806ff..39885e1e12 100644 --- a/indra/newview/skins/default/xui/fr/panel_people.xml +++ b/indra/newview/skins/default/xui/fr/panel_people.xml @@ -21,8 +21,8 @@ <accordion_tab name="tab_all" title="Tout"/> </accordion> <text name="no_friends_msg"> - Pour ajouter des amis, essayez [secondlife:///app/search/people la recherche globale] ou cliquez sur un utilisateur pour l'ajouter à vos amis. -Si vous voulez rencontrer d'autres résidents, ouvrez la [secondlife:///app/worldmap carte]. + Pour ajouter des amis, utilisez la [secondlife:///app/search/people recherche] ou cliquez sur un résident pour l'ajouter à vos amis. +Si vous souhaitez rencontrer d'autres résidents, cliquez sur [secondlife:///app/worldmap la carte]. </text> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Options"/> diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml index d24570b0a1..2cd8744ae5 100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml @@ -68,7 +68,7 @@ <text name="maturity_value" value="(inconnu)"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parcelle"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Catégorie :"/> <text name="rating_value" value="(inconnu)"/> <text name="voice_label" value="Voix :"/> @@ -87,7 +87,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Région"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Région :"/> <text name="region_name" value="Pays des orignaux"/> <text name="region_type_label" value="Type :"/> @@ -104,7 +104,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Domaine"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Domaine :"/> <text name="estate_rating_label" value="Catégorie :"/> <text name="estate_owner_label" value="Propriétaire :"/> @@ -112,7 +112,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="À vendre"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Prix :"/> <text name="area_label" value="Surface :"/> <text name="traffic_label" value="Trafic :"/> diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml index f6a64f0c58..f740dcd326 100644 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml @@ -7,9 +7,9 @@ <button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> <button label="Carte" name="map_btn"/> <button label="Éditer" name="edit_btn" tool_tip="Modifier les informations du repère"/> - <button name="overflow_btn" tool_tip="Afficher d'autres options"/> - <button label="Fermer" name="close_btn"/> - <button label="Annuler" name="cancel_btn"/> + <button label="▼" name="overflow_btn" tool_tip="Afficher d'autres options"/> <button label="Enregistrer" name="save_btn"/> + <button label="Annuler" name="cancel_btn"/> + <button label="Fermer" name="close_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 27242ec3de..71f7990073 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat écrit" name="chat"> + <text name="font_size"> + Font size: + </text> <radio_group name="chat_font_size"> <radio_item label="Moins" name="radio" value="0"/> <radio_item label="Moyenne" name="radio2" value="1"/> <radio_item label="Plus" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Font colors: + </text> <color_swatch label="Vous" name="user"/> <text name="text_box1"> Moi diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml index 27d2b2182b..4c055a2b8d 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -13,9 +13,12 @@ <check_box label="Activé" name="enable_voice_check"/> <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="vrai"/> <check_box label="Jouer le média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="vrai"/> - <text name="Listen from"> + <text name="voice_chat_settings"> Paramètres du chat vocal </text> + <text name="Listen from"> + Écouter à partir de : + </text> <radio_group name="ear_location"> <radio_item label="Position de la caméra" name="0"/> <radio_item label="Position de l'avatar" name="1"/> diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml index 8f1d806617..b9bc1dd9d8 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -22,10 +22,10 @@ [AMT] L$ </panel.string> <button label="" label_selected="" name="buycurrency" right="-250" tool_tip="Mon solde"/> - <button label="Acheter des L$" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/> + <button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/> <text name="TimeText" tool_tip="Heure actuelle (Pacifique)"> 00h00 PST </text> - <button name="media_toggle_btn" tool_tip="Cliquer pour activer/désactiver le média"/> + <button name="media_toggle_btn" tool_tip="Arrêter tous les médias (musique, vidéo, pages web)"/> <button name="volume_btn" tool_tip="Contrôle du volume global"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml index e617ae444d..def71d96b4 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="Profil de l'objet"/> <text name="where" value="(dans Second Life)"/> - <panel label=""> + <panel name="properties_panel" label=""> <text name="Name:"> Nom : </text> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index c9a5b5917d..d78b78f7d0 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1506,6 +1506,9 @@ <string name="NoPicksClassifiedsText"> Vous n'avez pas créé de favoris ni de petites annonces Cliquez sur le bouton Plus pour créer un favori ou une petite annonce. </string> + <string name="NoAvatarPicksClassifiedsText"> + L'utilisateur n'a ni favoris ni petites annonces + </string> <string name="PicksClassifiedsLoadingText"> Chargement... </string> diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml index a672df0d96..1b47dd7d7e 100644 --- a/indra/newview/skins/default/xui/it/floater_world_map.xml +++ b/indra/newview/skins/default/xui/it/floater_world_map.xml @@ -5,7 +5,8 @@ Legenda </text> </panel> - <panel> + <panel + name="layout_panel_2"> <button font="SansSerifSmall" label="Mostra la mia posizione" label_selected="Mostra la mia posizione" left_delta="91" name="Show My Location" tool_tip="Centra la mappa sul luogo dove si trova il mio avatar" width="135"/> <text name="person_label"> Io @@ -37,12 +38,14 @@ </text> <check_box label="Adult" name="event_adult_chk"/> </panel> - <panel> + <panel + name="layout_panel_3"> <text name="find_on_map_label"> Trova sulla Mappa </text> </panel> - <panel> + <panel + name="layout_panel_4"> <combo_box label="Amici Online" name="friend combo" tool_tip="Mostra amici sulla mappa"> <combo_box.item label="Miei Amici Online" name="item1"/> </combo_box> @@ -59,12 +62,14 @@ <button font="SansSerifSmall" label="Copia SLurl" name="copy_slurl" tool_tip="Copia il luogo attuale come SLurl per essere usato nel web."/> <button font="SansSerifSmall" label="Mostra Selezione" label_selected="Mostra destinazione" left_delta="91" name="Show Destination" tool_tip="Centra la mappa sul luogo prescelto" width="135"/> </panel> - <panel> + <panel + name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel> + <panel + name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml index 70e1577199..03716ba4c5 100644 --- a/indra/newview/skins/default/xui/it/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml @@ -48,7 +48,7 @@ <text name="maturity_value" value="sconosciuto"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parcel"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Valutazione:"/> <text name="rating_value" value="sconosciuto"/> <text name="voice_label" value="Voice:"/> @@ -67,7 +67,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Regione"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Regione:"/> <text name="region_type_label" value="Scrivi:"/> <text name="region_rating_label" value="Valutazione:"/> @@ -77,7 +77,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Proprietà immobiliare"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Proprietà immobiliare:"/> <text name="estate_rating_label" value="Valutazione:"/> <text name="estate_owner_label" value="Proprietà:"/> @@ -85,7 +85,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="In vendita"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Prezzo:"/> <text name="area_label" value="Area:"/> <text name="traffic_label" value="Traffico:"/> diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml index e5f27795be..0eecdfb2a2 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml @@ -36,7 +36,7 @@ <panel.string name="Sale Mixed"> Vendita assortita </panel.string> - <panel label=""> + <panel name="properties_panel" label=""> <text name="Name:"> Nome: </text> @@ -74,7 +74,7 @@ </combo_box> <spinner label="Prezzo: L$" name="Edit Cost"/> <check_box label="Mostra nella ricerca" name="search_check" tool_tip="Mostra questo oggetto nei risultati della ricerca"/> - <panel name="perms_build"> + <panel name="perms_inv"> <text name="perm_modify"> Puoi modificare questo oggetto </text> diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml index 9105c2613d..0eaad11cc7 100644 --- a/indra/newview/skins/default/xui/ja/floater_about.xml +++ b/indra/newview/skins/default/xui/ja/floater_about.xml @@ -43,7 +43,7 @@ Vivox バージョン： [VIVOX_VERSION] </panel> <panel label="クレジット" name="credits_panel"> <text_editor name="credits_editor"> - Second Lifeは、 Philip、Tessa、Andrew、Cory、James、Ben、Char、Charlie、Colin、Dan、Daniel、Doug、Eric、Hamlet、Haney、Eve、Hunter、Ian、Jeff、Jennifer、Jim、John、Lee、Mark、Peter、Phoenix、Richard、Robin、Xenon、Steve、Tanya、Eddie、Avi、Frank、Bruce、Aaron、Alice、Bob、Debra、Eileen、Helen、Janet、Louie、Leviathania、Stefan、Ray、Kevin、Tom、Mikeb、MikeT、Burgess、Elena、Tracy、Bill、Todd、Ryan、Zach、Sarah、Nova、Tim、Stephanie、Michael、Evan、Nicolas、Catherine、Rachelle、Dave、Holly、Bub、Kelly、Magellan、Ramzi、Don、Sabin、Jill、Rheya、Jeska、Torley、Kona、Callum、Charity、Ventrella、Jack、Vektor、Iris、Chris、Nicole、Mick、Reuben、Blue、Babbage、Yedwab、Deana、Lauren、Brent、Pathfinder、Chadrick、Altruima、Jesse、Teeny、Monroe、Icculus、David、Tess、Lizzie、Patsy、Isaac、Lawrence、Cyn、Bo、Gia、Annette、Marius、Tbone、Jonathan、Karen、Ginsu、Satoko、Yuko、Makiko、Thomas、Harry、Seth、Alexei、Brian、Guy、Runitai、Ethan、Data、Cornelius、Kenny、Swiss、Zero、Natria、Wendy、Stephen、Teeple、Thumper、Lucy、Dee、Mia、Liana、Warren、Branka、Aura、beez、Milo、Hermia、Red、Thrax、Joe、Sally、Magenta、Mogura、Paul、Jose、Rejean、Henrik、Lexie、Amber、Logan、Xan、Nora、Morpheus、Donovan、Leyla、MichaelFrancis、Beast、Cube、Bucky、Joshua、Stryfe、Harmony、Teresa、Claudia、Walker、Glenn、Fritz、Fordak、June、Cleopetra、Jean、Ivy、Betsy、Roosevelt、Spike、Ken、Which、Tofu、Chiyo、Rob、Zee、dustin、George、Del、Matthew、Cat、Jacqui、Lightfoot、Adrian、Viola、Alfred、Noel、Irfan、Sunil、Yool、Rika、Jane、Xtreme、Frontier、a2、Neo、Siobhan、Yoz、Justin、Elle、Qarl、Benjamin、Isabel、Gulliver、Everett、Christopher、Izzy、Stephany、Garry、Sejong、Sean、Tobin、Iridium、Meta、Anthony、Jeremy、JP、Jake、Maurice、Madhavi、Leopard、Kyle、Joon、Kari、Bert、Belinda、Jon、Kristi、Bridie、Pramod、KJ、Socrates、Maria、Ivan、Aric、Yamasaki、Adreanne、Jay、MitchK、Ceren、Coco、Durl、Jenny、Periapse、Kartic、Storrs、Lotte、Sandy、Rohn、Colossus、Zen、BigPapi、Brad、Pastrami、Kurz、Mani、Neuro、Jaime、MJ、Rowan、Sgt、Elvis、Gecko、Samuel、Sardonyx、Leo、Bryan、Niko、Soft、Poppy、Rachel、Aki、Angelo、Banzai、Alexa、Sue、CeeLo、Bender、CG、Gillian、Pelle、Nick、Echo、Zara、Christine、Shamiran、Emma、Blake、Keiko、Plexus、Joppa、Sidewinder、Erica、Ashlei、Twilight、Kristen、Brett、Q、Enus、Simon、Bevis、Kraft、Kip、Chandler、Ron、LauraP、Ram、KyleJM、Scouse、Prospero、Melissa、Marty、Nat、Hamilton、Kend、Lordan、Jimmy、Kosmo、Seraph、Green、Ekim、Wiggo、JT、Rome、Doris、Miz、Benoc、Whump、Trinity、Patch、Kate、TJ、Bao、Joohwan、Christy、Sofia、Matias、Cogsworth、Johan、Oreh、Cheah、Angela、Brandy、Mango、Lan、Aleks、Gloria、Heidy、Mitchell、Space、Colton、Bambers、Einstein、Maggie、Malbers、Rose、Winnie、Stella、Milton、Rothman、Niall、Marin、Allison、Katie、Dawn、Katt、Dusty、Kalpana、Judy、Andrea、Ambroff、Infinity、Gail、Rico、Raymond、Yi、William、Christa、M、Teagan、Scout、Molly、Dante、Corr、Dynamike、Usi、Kaylee、Vidtuts、Lil、Danica、Sascha、Kelv、Jacob、Nya、Rodney、Brandon、Elsie、Blondin、Grant、Katrin、Nyx、Gabriel、Locklainn、Claire、Devin、Minerva、Monty、Austin、Bradford、Si、Keira、H、Caitlin、Dita、Makai、Jenn、Ann、Meredith、Clare、Joy、Praveen、Cody、Edmund、Ruthe、Sirena、Gayathri、Spider、FJ、Davidoff、Tian、Jennie、Louise、Oskar、Landon、Noelle、Jarv、Ingrid、Al、Sommer、Doc、Aria、Huin、Gray、Lili、Vir、DJ、Yang、T、Simone、Maestro、Scott、Charlene、Quixote、Amanda、Susan、Zed、Anne、Enkidu、Esbee、Joroan、Katelin、Roxie、Tay、Scarlet、Kevin、Johnny、Wolfgang、Andren、Bob、Howard、Merov、Rand、Ray、Michon、Newell、Galen、Dessie、Les、Michon、Jenelle、Geo、Siz、Shapiro、Pete、Calyle、Selene、Allen、Phoebe、Goldin、Kimmora、Dakota、Slaton、Lindquist、Zoey、Hari、Othello、Rohit、Sheldon、Petra、Viale、Gordon、Kaye、Pink、Ferny、Emerson、Davy、Bri、Chan、Juan、Robert、Terrence、Nathan、Carlと、その他多数の人達によって作成されました。 + Second Life は、 Philip、Tessa、Andrew、Cory、James、Ben、Char、Charlie、Colin、Dan、Daniel、Doug、Eric、Hamlet、Haney、Eve、Hunter、Ian、Jeff、Jennifer、Jim、John、Lee、Mark、Peter、Phoenix、Richard、Robin、Xenon、Steve、Tanya、Eddie、Avi、Frank、Bruce、Aaron、Alice、Bob、Debra、Eileen、Helen、Janet、Louie、Leviathania、Stefan、Ray、Kevin、Tom、Mikeb、MikeT、Burgess、Elena、Tracy、Bill、Todd、Ryan、Zach、Sarah、Nova、Tim、Stephanie、Michael、Evan、Nicolas、Catherine、Rachelle、Dave、Holly、Bub、Kelly、Magellan、Ramzi、Don、Sabin、Jill、Rheya、Jeska、Torley、Kona、Callum、Charity、Ventrella、Jack、Vektor、Iris、Chris、Nicole、Mick、Reuben、Blue、Babbage、Yedwab、Deana、Lauren、Brent、Pathfinder、Chadrick、Altruima、Jesse、Teeny、Monroe、Icculus、David、Tess、Lizzie、Patsy、Isaac、Lawrence、Cyn、Bo、Gia、Annette、Marius、Tbone、Jonathan、Karen、Ginsu、Satoko、Yuko、Makiko、Thomas、Harry、Seth、Alexei、Brian、Guy、Runitai、Ethan、Data、Cornelius、Kenny、Swiss、Zero、Natria、Wendy、Stephen、Teeple、Thumper、Lucy、Dee、Mia、Liana、Warren、Branka、Aura、beez、Milo、Hermia、Red、Thrax、Joe、Sally、Magenta、Mogura、Paul、Jose、Rejean、Henrik、Lexie、Amber、Logan、Xan、Nora、Morpheus、Donovan、Leyla、MichaelFrancis、Beast、Cube、Bucky、Joshua、Stryfe、Harmony、Teresa、Claudia、Walker、Glenn、Fritz、Fordak、June、Cleopetra、Jean、Ivy、Betsy、Roosevelt、Spike、Ken、Which、Tofu、Chiyo、Rob、Zee、dustin、George、Del、Matthew、Cat、Jacqui、Lightfoot、Adrian、Viola、Alfred、Noel、Irfan、Sunil、Yool、Rika、Jane、Xtreme、Frontier、a2、Neo、Siobhan、Yoz、Justin、Elle、Qarl、Benjamin、Isabel、Gulliver、Everett、Christopher、Izzy、Stephany、Garry、Sejong、Sean、Tobin、Iridium、Meta、Anthony、Jeremy、JP、Jake、Maurice、Madhavi、Leopard、Kyle、Joon、Kari、Bert、Belinda、Jon、Kristi、Bridie、Pramod、KJ、Socrates、Maria、Ivan、Aric、Yamasaki、Adreanne、Jay、MitchK、Ceren、Coco、Durl、Jenny、Periapse、Kartic、Storrs、Lotte、Sandy、Rohn、Colossus、Zen、BigPapi、Brad、Pastrami、Kurz、Mani、Neuro、Jaime、MJ、Rowan、Sgt、Elvis、Gecko、Samuel、Sardonyx、Leo、Bryan、Niko、Soft、Poppy、Rachel、Aki、Angelo、Banzai、Alexa、Sue、CeeLo、Bender、CG、Gillian、Pelle、Nick、Echo、Zara、Christine、Shamiran、Emma、Blake、Keiko、Plexus、Joppa、Sidewinder、Erica、Ashlei、Twilight、Kristen、Brett、Q、Enus、Simon、Bevis、Kraft、Kip、Chandler、Ron、LauraP、Ram、KyleJM、Scouse、Prospero、Melissa、Marty、Nat、Hamilton、Kend、Lordan、Jimmy、Kosmo、Seraph、Green、Ekim、Wiggo、JT、Rome、Doris、Miz、Benoc、Whump、Trinity、Patch、Kate、TJ、Bao、Joohwan、Christy、Sofia、Matias、Cogsworth、Johan、Oreh、Cheah、Angela、Brandy、Mango、Lan、Aleks、Gloria、Heidy、Mitchell、Space、Colton、Bambers、Einstein、Maggie、Malbers、Rose、Winnie、Stella、Milton、Rothman、Niall、Marin、Allison、Katie、Dawn、Katt、Dusty、Kalpana、Judy、Andrea、Ambroff、Infinity、Gail、Rico、Raymond、Yi、William、Christa、M、Teagan、Scout、Molly、Dante、Corr、Dynamike、Usi、Kaylee、Vidtuts、Lil、Danica、Sascha、Kelv、Jacob、Nya、Rodney、Brandon、Elsie、Blondin、Grant、Katrin、Nyx、Gabriel、Locklainn、Claire、Devin、Minerva、Monty、Austin、Bradford、Si、Keira、H、Caitlin、Dita、Makai、Jenn、Ann、Meredith、Clare、Joy、Praveen、Cody、Edmund、Ruthe、Sirena、Gayathri、Spider、FJ、Davidoff、Tian、Jennie、Louise、Oskar、Landon、Noelle、Jarv、Ingrid、Al、Sommer、Doc、Aria、Huin、Gray、Lili、Vir、DJ、Yang、T、Simone、Maestro、Scott、Charlene、Quixote、Amanda、Susan、Zed、Anne、Enkidu、Esbee、Joroan、Katelin、Roxie、Tay、Scarlet、Kevin、Johnny、Wolfgang、Andren、Bob、Howard、Merov、Rand、Ray、Michon、Newell、Galen、Dessie、Les、Michon、Jenelle、Geo、Siz、Shapiro、Pete、Calyle、Selene、Allen、Phoebe、Goldin、Kimmora、Dakota、Slaton、Lindquist、Zoey、Hari、Othello、Rohit、Sheldon、Petra、Viale、Gordon、Kaye、Pink、Ferny、Emerson、Davy、Bri、Chan、Juan、Robert、Terrence、Nathan、Carlと、その他多数の人達によって作成されました。 このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。 able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml index 3730bcd385..610d4183b3 100644 --- a/indra/newview/skins/default/xui/ja/floater_camera.xml +++ b/indra/newview/skins/default/xui/ja/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> カメラを上下左右に移動 </floater.string> + <floater.string name="orbit_mode_title"> + 旋回 + </floater.string> + <floater.string name="pan_mode_title"> + 水平・垂直移動 + </floater.string> + <floater.string name="avatar_view_mode_title"> + 固定 + </floater.string> + <floater.string name="free_mode_title"> + オブジェクトを見る + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/> <panel name="zoom" tool_tip="向いている方法にカメラをズーム"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="カメラを回す"/> <button label="" name="pan_btn" tool_tip="カメラを水平・垂直移動"/> - <button label="" name="avatarview_btn" tool_tip="アバター視点"/> + <button label="" name="avatarview_btn" tool_tip="固定"/> <button label="" name="freecamera_btn" tool_tip="オブジェクトを見る"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml index 306b262b70..671f9077d9 100644 --- a/indra/newview/skins/default/xui/ja/floater_event.xml +++ b/indra/newview/skins/default/xui/ja/floater_event.xml @@ -9,6 +9,18 @@ <floater.string name="dont_notify"> 知らせない </floater.string> + <floater.string name="moderate"> + Moderate + </floater.string> + <floater.string name="adult"> + Adult + </floater.string> + <floater.string name="general"> + General + </floater.string> + <floater.string name="unknown"> + 不明 + </floater.string> <layout_stack name="layout"> <layout_panel name="profile_stack"> <text name="event_name"> @@ -21,12 +33,21 @@ 主催者： </text> <text initial_value="（取得中）" name="event_runby"/> + <text name="event_date_label"> + 日付： + </text> <text name="event_date"> 10/10/2010 </text> + <text name="event_duration_label"> + 期間： + </text> <text name="event_duration"> 1 時間 </text> + <text name="event_covercharge_label"> + カバーチャージ： + </text> <text name="event_cover"> 無料 </text> diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml index 8ba297c7a0..20aec48541 100644 --- a/indra/newview/skins/default/xui/ja/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> 後ろに飛ぶ（下矢印か S を押す） </string> + <string name="walk_title"> + 歩く + </string> + <string name="run_title"> + 走る + </string> + <string name="fly_title"> + 飛ぶ + </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）"/> <button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="歩行モード"/> <button label="" name="mode_run_btn" tool_tip="走行モード"/> <button label="" name="mode_fly_btn" tool_tip="飛行モード"/> - <button label="飛行停止" name="stop_fly_btn" tool_tip="飛行停止"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml index 606dda12bd..4fc59e16d3 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> 説明： </text> - <button label="インワールドで再生する" label_selected="停止" name="Anim play btn" tool_tip="他人にも見えるように再生します"/> + <button label="インワールドで再生" label_selected="停止" name="Anim play btn" tool_tip="他人にも見えるように再生します"/> <button label="ローカル再生" label_selected="停止" name="Anim audition btn" tool_tip="自分だけが見えるように再生します"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml index 8a0aea717c..c437e8c02a 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml @@ -33,10 +33,10 @@ <text name="trigger_label"> トリガー: </text> - <text name="replace_text" tool_tip="トリガー・ワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"> + <text name="replace_text" tool_tip="トリガーワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"> 置換： </text> - <line_editor name="replace_editor" tool_tip="トリガー・ワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"/> + <line_editor name="replace_editor" tool_tip="トリガーワードをこれらの単語に置き換えます。 たとえば、トリガー「hello」を「Howdy」に置換すると、「I wanted to say hello」というチャット文が「I wanted to say howdy」に変わり、ジェスチャーにも置換が反映されます。"/> <text name="key_label"> ショートカット： </text> @@ -62,7 +62,7 @@ <text name="help_label"> 待機ステップを入れない限りは、すべてのステップが同時に起こります。 </text> - <check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェスチャーは、トリガー・フレーズを使うか、またはホット・キーを押すことによってトリガーできます。 1つのショートカット・キーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/> + <check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブなジェスチャーは、トリガーフレーズを使うか、ホットキーを押すと切り替わります。 1つのショートカットキーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/> <button label="プレビュー" name="preview_btn"/> <button label="保存" name="save_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml index c8375389ce..5c0f05cec6 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml @@ -6,6 +6,6 @@ <text name="desc txt"> 説明： </text> - <button label="インワールドで再生する" label_selected="インワールドで再生する" name="Sound play btn" tool_tip="他人にも聞こえるように再生します"/> + <button label="インワールドで再生" label_selected="インワールドで再生" name="Sound play btn" tool_tip="他人にも聞こえるように再生します"/> <button label="ローカル再生" label_selected="ローカル再生" name="Sound audition btn" tool_tip="自分だけが聞こえるように再生します"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index e9de43189c..a8261a7493 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -69,7 +69,7 @@ </text> <check_box label="両側を引伸ばす" left="116" name="checkbox uniform"/> <check_box initial_value="true" label="テクスチャを引伸ばす" name="checkbox stretch textures"/> - <check_box initial_value="true" label="グリッドポイントにスナップ" left_delta="27" name="checkbox snap to grid"/> + <check_box initial_value="true" label="グリッドにスナップ" left_delta="27" name="checkbox snap to grid"/> <combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" width="76"> <combo_box.item label="インワールドグリッド" name="World"/> <combo_box.item label="ローカルグリッド" name="Local"/> diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml index 5a0694e5c5..5af8f20690 100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml @@ -16,6 +16,9 @@ 近くにボイスを有効にしている人はいません。 </string> <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="マイ アバター："/> + </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="コール終了" name="leave_call_btn"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index 42fedfc075..04120b4bea 100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml @@ -5,7 +5,8 @@ 表記・記号 </text> </panel> - <panel> + <panel + name="layout_panel_2"> <button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="アバターの位置を地図の中心に表示します"/> <text name="me_label"> 自分 @@ -48,12 +49,14 @@ Adult </text> </panel> - <panel> + <panel + name="layout_panel_3"> <text name="find_on_map_label"> 地図上で探す </text> </panel> - <panel> + <panel + name="layout_panel_4"> <combo_box label="オンラインのフレンド" name="friend combo" tool_tip="フレンドを地図上に表示します"> <combo_box.item label="オンラインのフレンド" name="item1"/> </combo_box> @@ -71,12 +74,14 @@ <button label="SLurl をコピー" name="copy_slurl" tool_tip="現在地を SLurl でコピーして Web で使用します。"/> <button label="選択をを表示する" label_selected="目的地を表示" name="Show Destination" tool_tip="選択した場所を地図の中心に表示します"/> </panel> - <panel> + <panel + name="layout_panel_5"> <text name="zoom_label"> ズーム </text> </panel> - <panel> + <panel + name="layout_panel_6"> <slider label="ズーム" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml index 1ff2dfec7b..e59a500534 100644 --- a/indra/newview/skins/default/xui/ja/menu_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_object.xml @@ -5,6 +5,7 @@ <menu_item_call label="制作" name="Build"/> <menu_item_call label="開く" name="Open"/> <menu_item_call label="ここに座る" name="Object Sit"/> + <menu_item_call label="立ち上がる" name="Object Stand Up"/> <menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/> <menu_item_call label="ズームイン" name="Zoom In"/> <context_menu label="装着 ▶" name="Put On"> @@ -18,6 +19,7 @@ <menu_item_call label="返却" name="Return..."/> <menu_item_call label="削除" name="Delete"/> </context_menu> + <menu_item_call label="買う" name="Pie Object Bye"/> <menu_item_call label="取る" name="Pie Object Take"/> <menu_item_call label="コピーを取る" name="Take Copy"/> <menu_item_call label="支払う" name="Pay..."/> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml index 4788803789..8d84b0e521 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml @@ -5,6 +5,7 @@ <menu_item_call label="フレンドを削除" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="コール" name="Call"/> + <menu_item_call label="地図" name="Map"/> <menu_item_call label="共有" name="Share"/> <menu_item_call label="支払う" name="Pay"/> <menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index a97e7f2f5d..e6fb07f120 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -6,12 +6,12 @@ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/> </menu_item_call> <menu_item_call label="L$ の購入" name="Buy and Sell L$"/> - <menu_item_call label="マイ プロフィール" name="Profile"/> - <menu_item_call label="マイ 容姿" name="Appearance"/> - <menu_item_check label="マイ 持ち物" name="Inventory"/> + <menu_item_call label="プロフィール" name="Profile"/> + <menu_item_call label="容姿" name="Appearance"/> + <menu_item_check label="持ち物" name="Inventory"/> <menu_item_check label="持ち物" name="ShowSidetrayInventory"/> - <menu_item_check label="マイ ジェスチャー" name="Gestures"/> - <menu label="マイ ログイン状態" name="Status"> + <menu_item_check label="ジェスチャー" name="Gestures"/> + <menu label="ログイン状態" name="Status"> <menu_item_call label="一時退席中" name="Set Away"/> <menu_item_call label="取り込み中" name="Set Busy"/> </menu> @@ -43,6 +43,8 @@ <menu_item_check label="ビーコン（標識）" name="beacons"/> <menu_item_check label="プロパティ境界線" name="Property Lines"/> <menu_item_check label="土地所有者" name="Land Owners"/> + <menu_item_check label="座標" name="Coordinates"/> + <menu_item_check label="区画プロパティ" name="Parcel Properties"/> </menu> <menu_item_call label="ホームにテレポート" name="Teleport Home"/> <menu_item_call label="現在地をホームに設定" name="Set Home to Here"/> @@ -81,6 +83,7 @@ <menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/> <menu_item_call label="選択したものをズームする" name="Zoom to Selection"/> <menu label="オブジェクト" name="Object"> + <menu_item_call label="買う" name="Menu Object Buy"/> <menu_item_call label="取る" name="Menu Object Take"/> <menu_item_call label="コピーを取る" name="Take Copy"/> <menu_item_call label="「持ち物」に保存" name="Save Object Back to My Inventory"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 2f877a6aba..4fc3f1d46f 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -339,10 +339,10 @@ L$ が不足しているのでこのグループに参加することができ まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。 </notification> <notification name="MustHaveAccountToLogIn"> - おっと! 記入漏れがありますよ。 + おっと！記入漏れがありますよ。 アバターのファーストネームとラストネームの両方を入力する必要があります。 -[SECOND_LIFE]に入るには、アカウントが必要です。 アカウントを作成しますか？ +[SECOND_LIFE] に入るには、アカウントが必要です。 アカウントを作成しますか？ <url name="url"> https://join.secondlife.com/index.php?lang=ja-JP </url> @@ -470,7 +470,6 @@ L$ が不足しているのでこのグループに参加することができ <notification name="UnsupportedHardware"> お使いのコンピューターは [APP_NAME] の必要最低限の動作環境を満たしていません。 パフォーマンスの低下を感じるかもしれません。 恐れ入りますが [SUPPORT_SITE] ではサポート対象外のシステムに関する技術的サポートは行っておりません。 -最低動作環境 [_URL] に移動して確認をしますか？ <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=ja @@ -586,7 +585,7 @@ L$ が不足しているのでこのグループに参加することができ このファイルの拡張子が正しいかどうかを確認してください。 </notification> <notification name="InvalidFileExtension"> - [EXTENSION]は無効です。 + [EXTENSION] は無効です。 正しい拡張子：[VALIDS] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -1345,7 +1344,7 @@ F1 キーを押してください。 </notification> <notification name="ConfirmKick"> すべてのユーザーをグリッドの外にキックしようとしています。操作を続行しますか？ - <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="全てのユーザを追い出す"/> + <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="全てのユーザーを追い出す"/> </notification> <notification name="MuteLinden"> リンデンをブロックすることはできません。 @@ -1447,15 +1446,15 @@ F1 キーを押してください。 </notification> <notification name="TeleportFromLandmark"> このまま <nolink>[LOCATION]</nolink> にテレポートしますか？ - <usetemplate ignoretext="ランドマークにテレポートしたいかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/> + <usetemplate ignoretext="ランドマークにテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/> </notification> <notification name="TeleportToPick"> [PICK] にテレポートしますか？ - <usetemplate ignoretext="ピックの場所にテレポートしたいかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/> + <usetemplate ignoretext="ピックの場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/> </notification> <notification name="TeleportToClassified"> [CLASSIFIED] にテレポートしますか？ - <usetemplate ignoretext="クラシファイド広告の場所にテレポートしたいかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/> + <usetemplate ignoretext="クラシファイド広告の場所にテレポートしたいかどうかの確認" name="okcancelignore" notext="キャンセル" yestext="テレポート"/> </notification> <notification label="あなたの不動産内の全員にメッセージを送信" name="MessageEstate"> 今あなたの不動産にいる人全員に送る、短いメッセージを入力してください。 @@ -1931,7 +1930,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ForceCloseChatterBoxSession"> - [NAME]とのチャットセッションを閉じます。 + [NAME] とのチャットセッションを閉じます。 [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -1944,8 +1943,8 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AutoWearNewClothing"> - 作成しようとしている衣類を自動的に装着しますか？ - <usetemplate ignoretext="「マイ 容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/> + 作成する衣類を自動的に装着しますか？ + <usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/> </notification> <notification name="NotAgeVerified"> 年齢確認を済ませていないとこの区画を訪れることができません。 [SECOND_LIFE] サイトで年齢の確認を行いますか？ @@ -2229,27 +2228,27 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ そのリージョンにいないと公共の土地を取得することはできません。 </notification> <notification name="RegionTPAccessBlocked"> - あなたのレーティング区分によりそのリージョン（地域）へは入ることができません。 年齢確認を行うか、最新ビューワをインストールしてください。 + あなたのレーティング区分によりそのリージョンへは入ることができません。 年齢確認を行うか、最新ビューワをインストールしてください。 現在のレーティング区分でアクセス可能なエリアに関する詳細はナレッジベースを参照してください。 </notification> <notification name="URBannedFromRegion"> - あなたはリージョン（地域）への立入が禁止されています。 + あなたはリージョンへの立入が禁止されています。 </notification> <notification name="NoTeenGridAccess"> あなたのアカウントではティーングリッドに接続できません。 </notification> <notification name="ImproperPaymentStatus"> - このリージョン（地域）に入るために適した支払いステータスがありません。 + このリージョンに入るために適した支払いステータスがありません。 </notification> <notification name="MustGetAgeRgion"> - このリージョン（地域）に入るには年齢確認済みである必要があります。 + このリージョンに入るためには、年齢確認を済ませる必要があります。 </notification> <notification name="MustGetAgeParcel"> - この区画に入るには年齢確認済みである必要があります。 + この区画に入るためには、年齢確認を済ませる必要があります。 </notification> <notification name="NoDestRegion"> - 目的地のリージョン（地域）が見つかりませんでした。 + 目的地のリージョンが見つかりませんでした。 </notification> <notification name="NotAllowedInDest"> 目的地に入る許可がありません。 @@ -2267,14 +2266,14 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ テレポートがキャンセルされました。 </notification> <notification name="FullRegionTryAgain"> - 入ろうとしているリージョン（地域）は現在満員です。 + 入ろうとしているリージョンは現在満員です。 しばらくしてから再度お試しください。 </notification> <notification name="GeneralFailure"> よくある失敗 </notification> <notification name="RoutedWrongRegion"> - 異なるリージョン（地域）に迂回されました。 もう一度お試しください。 + 異なるリージョンに迂回されました。 もう一度お試しください。 </notification> <notification name="NoValidAgentID"> エージェント ID が無効です。 @@ -2295,7 +2294,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ 内部エラーが発生しました。 </notification> <notification name="NoGoodTPDestination"> - このリージョン（地域）では適切なテレポート目的地が見つかりませんでした。 + このリージョンでは、適切なテレポート目的地が見つかりませんでした。 </notification> <notification name="InternalErrorRegionResolver"> 内部エラーが発生しました。 @@ -2382,7 +2381,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ [TO_NAME] にフレンド登録を申し出ました。 </notification> <notification name="OfferFriendshipNoMessage"> - [NAME]は、 + [NAME] は、 フレンド登録を申し込んでいます。 （デフォルトでお互いのオンライン状態を見ることができるようになります。） @@ -2397,6 +2396,12 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <notification name="FriendshipDeclined"> [NAME]は、フレンド登録を断りました。 </notification> + <notification name="FriendshipAcceptedByMe"> + フレンドの登録依頼が承認されました。 + </notification> + <notification name="FriendshipDeclinedByMe"> + フレンドの登録依頼が拒否されました。 + </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] がコーリングカードを渡そうとしています。 あなたの「持ち物」にブックマークが追加され、この住人に素早く IM を送ることができます。 @@ -2418,9 +2423,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ [MESSAGE] -読み込み元のオブジェクト：[OBJECTNAME]、所有者：[NAME]？ +読み込み元のオブジェクト：[OBJECTNAME]、所有者：[NAME] <form name="form"> - <button name="Gotopage" text="移動"/> + <button name="Gotopage" text="ページに移動"/> <button name="Cancel" text="取り消し"/> </form> </notification> @@ -2585,7 +2590,7 @@ M キーを押して変更します。 [VOICE_CHANNEL_NAME] のボイスチャットに接続中に、エラーが発生しました。後でもう一度お試しください。 </notification> <notification name="ServerVersionChanged"> - 異なるサーバーバージョンのリージョンに来ました。パフォーマンスに影響することがあります。 [[URL] リリースノートを確認] + サーバーのバージョンが異なるリージョンに来ました。パフォーマンスに影響することがあります。 [[URL] リリースノートを確認] </notification> <notification name="UnsupportedCommandSLURL"> クリックした SLurl はサポートされていません。 @@ -2605,7 +2610,7 @@ M キーを押して変更します。 </notification> <notification name="ConfirmCloseAll"> すべての IM を閉じますか？ - <usetemplate name="okcancelignore" notext="キャンセル" yestext="OK"/> + <usetemplate ignoretext="すべての IM を閉じる前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/> </notification> <notification name="AttachmentSaved"> アタッチメントが保存されました。 diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml index be15e92aa1..f2429ac12a 100644 --- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="共有" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="支払う" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml index bad4cdbc05..5097a352e5 100644 --- a/indra/newview/skins/default/xui/ja/panel_people.xml +++ b/indra/newview/skins/default/xui/ja/panel_people.xml @@ -21,7 +21,7 @@ <accordion_tab name="tab_all" title="全員"/> </accordion> <text name="no_friends_msg"> - お友達を追加するには、[secondlife:///app/search/people グローバル検索] をするか、ユーザーをクリックして行ってください。 + フレンドを追加するには、[secondlife:///app/search/people グローバル検索] をするか、ユーザーを右クリックしてください。 誰か一緒に行動をする人をお探しの時は、[secondlife:///app/worldmap 地図をお試しださい]。 </text> <panel label="bottom_panel" name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index 1f5031f3de..132fb95fe7 100644 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml @@ -68,7 +68,7 @@ <text name="maturity_value" value="不明"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="区画"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="レーティング区分："/> <text name="rating_value" value="不明"/> <text name="voice_label" value="ボイス："/> @@ -87,7 +87,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="リージョン（地域） "> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="地域:"/> <text name="region_name" value="Mooseland"/> <text name="region_type_label" value="種類："/> @@ -104,7 +104,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="エステート（不動産）"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="不動産："/> <text name="estate_rating_label" value="レーティング区分："/> <text name="estate_owner_label" value="所有者："/> @@ -112,7 +112,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="販売中"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="価格："/> <text name="area_label" value="面積："/> <text name="traffic_label" value="トラフィック："/> diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml index e2dba19c1d..a7fbc79884 100644 --- a/indra/newview/skins/default/xui/ja/panel_places.xml +++ b/indra/newview/skins/default/xui/ja/panel_places.xml @@ -7,9 +7,9 @@ <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートします"/> <button label="地図" name="map_btn"/> <button label="編集" name="edit_btn" tool_tip="ランドマークの情報を編集します"/> - <button name="overflow_btn" tool_tip="その他のオプションを表示"/> - <button label="閉じる" name="close_btn"/> - <button label="キャンセル" name="cancel_btn"/> + <button label="▼" name="overflow_btn" tool_tip="その他のオプションを表示"/> <button label="保存" name="save_btn"/> + <button label="キャンセル" name="cancel_btn"/> + <button label="閉じる" name="close_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index d6fe54fbd1..b0572804cb 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="チャット" name="chat"> + <text name="font_size"> + Font size: + </text> <radio_group name="chat_font_size"> <radio_item label="小" name="radio" value="0"/> <radio_item label="中" name="radio2" value="1"/> <radio_item label="大" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Font colors: + </text> <color_swatch label="自分" name="user"/> <text name="text_box1"> 自分 diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml index af64a217f6..fe830d864f 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml @@ -13,9 +13,12 @@ <check_box label="有効" name="enable_voice_check"/> <check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/> <check_box label="他のアバターに取り付けられたメディアを再生します" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします。" value="true"/> - <text name="Listen from"> + <text name="voice_chat_settings"> ボイスチャットの設定 </text> + <text name="Listen from"> + 方向： + </text> <radio_group name="ear_location"> <radio_item label="カメラの位置から聞く" name="0"/> <radio_item label="アバターの位置から聞く" name="1"/> diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml index 5364b8726f..3fd14ece06 100644 --- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml @@ -20,10 +20,10 @@ <sidetray_tab description="行きたい場所、行ったことのある場所を探してください。" label="場所" name="sidebar_places" tab_title="場所"> <panel label="場所" name="panel_places"/> </sidetray_tab> - <sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory" tab_title="マイ 持ち物"> + <sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory" tab_title="持ち物"> <panel label="持ち物を編集" name="sidepanel_inventory"/> </sidetray_tab> - <sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance" tab_title="マイ 容姿"> + <sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance" tab_title="容姿"> <panel label="容姿の編集" name="sidepanel_appearance"/> </sidetray_tab> </side_tray> diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml index aef1f90298..ea17cd6526 100644 --- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml @@ -22,13 +22,13 @@ </text> </panel> <panel name="sidebar_appearance"> - <text name="tab_name" value="マイ 容姿"/> + <text name="tab_name" value="容姿"/> <text name="tab_description"> あなたの容姿や現在の見た目を変更します。 </text> </panel> <panel name="sidebar_inventory"> - <text name="tab_name" value="マイ 持ち物"/> + <text name="tab_name" value="持ち物"/> <text name="tab_description"> あなたの持ち物を眺めます。 </text> diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml index a9e13cfd9f..8ffcd8863e 100644 --- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml @@ -22,10 +22,10 @@ L$ [AMT] </panel.string> <button label="" label_selected="" name="buycurrency" tool_tip="所持金"/> - <button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/> + <button label="買う" name="buyL" tool_tip="クリックして L$ を購入します"/> <text name="TimeText" tool_tip="現在時刻（太平洋）"> 24:00 AM PST </text> - <button name="media_toggle_btn" tool_tip="クリックしてメディアを切り替えます"/> + <button name="media_toggle_btn" tool_tip="すべてのメディアを開始・停止（音楽、ビデオ、Web ページ）"/> <button name="volume_btn" tool_tip="グローバル音量設定"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml index 2264ae965b..c1bf81f7e7 100644 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml @@ -12,6 +12,6 @@ <accordion_tab name="6_months_and_older" title="半年以上前"/> </accordion> <panel label="bottom_panel" name="bottom_panel"> - <button name="gear_btn" tool_tip="その他のオプションを表示"/> + <button name="gear_btn" tool_tip="オプションを表示します"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml index ab00953f1a..439891bab1 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="オブジェクトのプロフィール"/> <text name="where" value="（インワールド）"/> - <panel label=""> + <panel name="properties_panel" label=""> <text name="Name:"> 名前： </text> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 76b702e581..de0de5a0c9 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1506,6 +1506,9 @@ <string name="NoPicksClassifiedsText"> ピックやクラシファイド広告を作成していません。 作成するには、下にある「プラス」ボタンをクリックします。 </string> + <string name="NoAvatarPicksClassifiedsText"> + ピック、またはクラシファイド広告がありません + </string> <string name="PicksClassifiedsLoadingText"> ローディング... </string> diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml index 37e35ed1e9..815c36606c 100644 --- a/indra/newview/skins/default/xui/pl/floater_auction.xml +++ b/indra/newview/skins/default/xui/pl/floater_auction.xml @@ -1,9 +1,11 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAŻ POSIADŁOŚCI"> - <check_box label="Zawierając żółte ogrodzenie" name="fence_check" /> - <button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn" /> - <button label="OK" label_selected="OK" name="ok_btn" /> - <string name="already for sale"> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAŻ POSIADŁOŚCI LINDENÓW"> + <floater.string name="already for sale"> Nie możesz umieścić posiadłości na aukcji, jeżeli już została wystawiona na sprzedaż. - </string> + </floater.string> + <check_box initial_value="true" label="Zawierając żółte ogrodzenie" name="fence_check"/> + <button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn"/> + <button label="Sprzedaj Każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/> + <button label="Wyczyść Ustawienia" label_selected="Wyczyść Ustawienia" name="reset_parcel_btn"/> + <button label="Rozpocznij Aukcję" label_selected="Rozpocznij Aukcję" name="start_auction_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 5957018144..95d82a3f9c 100644 --- a/indra/newview/skins/default/xui/pl/floater_camera.xml +++ b/indra/newview/skins/default/xui/pl/floater_camera.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="camera_floater" title=""> <floater.string name="rotate_tooltip"> Obracaj kamerę wokół obiektu @@ -10,7 +10,22 @@ Poruszaj kamerą w dół/górę oraz w prawo/lewo </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w dół/górę oraz w prawo/lewo"/> - <joystick_zoom name="zoom" tool_tip="Najedź kamerą w kierunku obiektu"/> + <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w górę, w dół, w lewo i w prawo"/> + <panel name="zoom" tool_tip="Najedź kamerą w kierunku obiektu"> + <slider_bar name="zoom_slider" tool_tip="Przybliż kamerę do ogniskowej"/> + </panel> + <joystick_rotate name="cam_rotate_stick" tool_tip="Obracaj kamerę wokoł osi"/> + <panel name="camera_presets"> + <button name="rear_view" tool_tip="Widok z Tyłu"/> + <button name="group_view" tool_tip="Podgląd Grupy"/> + <button name="front_view" tool_tip="Widok z Przodu"/> + <button name="mouselook_view" tool_tip="Widok Panoramiczny"/> + </panel> + </panel> + <panel name="buttons"> + <button label="" name="orbit_btn" tool_tip="Obracaj Kamerę"/> + <button label="" name="pan_btn" tool_tip="Kamera Horyzontalna"/> + <button label="" name="avatarview_btn" tool_tip="Widok Awatara"/> + <button label="" name="freecamera_btn" tool_tip="Podgląd Obiektu"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml index 904a2cc270..7bbdc35f94 100644 --- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="ColorPicker" title="WYBÓR KOLORU"> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="ColorPicker" title="WYBIERZ KOLOR"> <text name="r_val_text"> Czerwony: </text> @@ -18,14 +18,14 @@ <text name="l_val_text"> Luminacja: </text> - <check_box label="Zastosuj od razu" name="apply_immediate" /> - <button label="" label_selected="" name="color_pipette" /> - <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" /> - <button label="Wybierz" label_selected="Wybierz" name="select_btn" /> + <check_box label="Zastosuj teraz" name="apply_immediate"/> + <button label="" label_selected="" name="color_pipette"/> + <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> + <button label="Ok" label_selected="Ok" name="select_btn"/> <text name="Current color:"> Obecny Kolor: </text> <text name="(Drag below to save.)"> - (Przeciągnij tutaj) + (Przeciągnij tutaj by zapisać) </text> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml index ff2d702132..a5d85aca4e 100644 --- a/indra/newview/skins/default/xui/pl/floater_hud.xml +++ b/indra/newview/skins/default/xui/pl/floater_hud.xml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="floater_hud" title="SAMOUCZEK" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_hud" title="SAMOUCZEK"/> diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml new file mode 100644 index 0000000000..f4dd7d00e1 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="panel_im"> + <layout_stack name="im_panels"> + <layout_panel label="Panel Kontroli Wiadomości Prywatnej (IM)" name="panel_im_control_panel"/> + <layout_panel> + <line_editor label="Do" name="chat_editor"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml index 8120ff8c77..e03c5faaeb 100644 --- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml @@ -1,12 +1,15 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="script ed float" title="SKRYPT: NOWY SKRYPT"> - <button label="Zresetuj" label_selected="Zresetuj" name="Reset" /> - <check_box label="Włącz" name="running" /> - <check_box label="Mono" name="mono" /> - <string name="not_allowed"> - Nie masz praw by widzieć zawartość tego skryptu. - </string> - <string name="script_running"> + <floater.string name="not_allowed"> + Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to "brak kopiowania". Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu. + </floater.string> + <floater.string name="script_running"> Włącz - </string> + </floater.string> + <floater.string name="Title"> + SKRYPT: [NAME] + </floater.string> + <button label="Zresetuj" label_selected="Zresetuj" name="Reset"/> + <check_box initial_value="true" label="Włącz" name="running"/> + <check_box initial_value="true" label="Mono" name="mono"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml index 88a878af72..87d74f6c15 100644 --- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="MemLeak" title="SYMULACJA PRZECIEKÓW ALOKACJI PAMIĘCI"> - <spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed" /> - <spinner label="Max Przecieki (MB):" name="max_leak" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="MemLeak" title="STYMULACJA WYCIEKU PAMIĘCI"> + <spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed"/> + <spinner label="Max Przecieki (MB):" name="max_leak"/> <text name="total_leaked_label"> Przeciekło: [SIZE] KB </text> @@ -11,8 +11,8 @@ <text name="note_label_2"> [NOTE2] </text> - <button label="Start" name="start_btn" /> - <button label="Stop" name="stop_btn" /> - <button label="Uwolnij" name="release_btn" /> - <button label="Zamknij" name="close_btn" /> + <button label="Start" name="start_btn"/> + <button label="Stop" name="stop_btn"/> + <button label="Uwolnij" name="release_btn"/> + <button label="Zamknij" name="close_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_my_friends.xml b/indra/newview/skins/default/xui/pl/floater_my_friends.xml index 0bcf6ba4d5..847c93f891 100644 --- a/indra/newview/skins/default/xui/pl/floater_my_friends.xml +++ b/indra/newview/skins/default/xui/pl/floater_my_friends.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_my_friends" title="KONTAKTY"> <tab_container name="friends_and_groups"> - <panel label="Znajomi" name="friends_panel" /> - <panel label="Grupy" name="groups_panel" /> + <panel label="Znajomi" name="friends_panel"/> + <panel label="Grupy" name="groups_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml index 834552e2b0..1b0dd6113e 100644 --- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="perm prefs" title="PRAWA DOMYŚLNE"> +<floater name="perm prefs" title="USTAWIENIA DOMYŚLNE ŁADOWANIA"> <panel label="Prawa" name="permissions"> <button label="?" label_selected="?" name="help"/> <check_box label="Udostępnij grupie" name="share_with_group"/> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml index 7139c470a4..2a49864e93 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml @@ -1,10 +1,11 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_anim"> + <floater.string name="Title"> + Animacja: [NAME] + </floater.string> <text name="desc txt"> Opis: </text> - <button label="Używaj w Świecie" label_selected="Stop" name="Anim play btn" - tool_tip="Animacja będzie widoczna dla wszystkich." width="131" left="20"/> - <button label="Używaj lokalnie" label_selected="Stop" name="Anim audition btn" - tool_tip="Animacja będzie widoczna tylko dla Ciebie." width="125" left="162"/> + <button label="Używaj w Świecie" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Uruchom tę animację by widzieli ją pozostali Rezydenci" width="131"/> + <button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom tę animację widoczną tylko przez Ciebie" width="125"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml index eae9ba2690..d3d6588397 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml @@ -1,2 +1,6 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="classified_preview" title="REKLAMA" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="classified_preview" title="INFO O REKLAMIE"> + <floater.string name="Title"> + Reklama: [NAME] + </floater.string> +</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml index 194a6da1bd..cf0abb2c23 100644 --- a/indra/newview/skins/default/xui/pl/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=""> - <button label="Anuluj" label_selected="Anuluj" name="Cancel" /> + <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> <text name="Save item as:"> - By wybrać wciśnij klawisz + Naciśnij by uruchomić przycisk mówienia. </text> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml index 0826508fd6..c66ac0a98f 100644 --- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Sound Preview" title="DŹWIĘK.WAV"> <text name="name_label"> Opis: @@ -6,6 +6,6 @@ <text name="description_label"> Opis: </text> - <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" /> - <button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn" /> + <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> + <button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml index 48366e2b64..011dc8ee7c 100644 --- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="texture picker" title="WYBÓR TEKSTURY"> +<floater name="texture picker" title="ULUBIONE: TEKSTURA"> <string name="choose_picture"> Kliknij by wybrać obraz </string> <text name="Multiple"> - Wiele + Wiele Tekstur </text> <text name="unknown"> - Wymiary: [DIMENSIONS] + Rozmiar: [DIMENSIONS] </text> <button label="Domyślna" label_selected="Domyślna" name="Default"/> <button label="Żadna" label_selected="Żadna" name="None"/> <button label="Pusta" label_selected="Pusta" name="Blank"/> <check_box label="Pokaż Foldery" name="show_folders_check"/> - <search_editor label="Wpisz nazwę tutaj by wyszukać" name="inventory search editor"/> - <check_box label="Zastosuj od razu" name="apply_immediate_check"/> + <search_editor label="Filtruj Tektury" name="inventory search editor"/> + <check_box label="Zastosuj teraz" name="apply_immediate_check"/> <button label="" label_selected="" name="Pipette"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> - <button label="Wybierz" label_selected="Wybierz" name="Select"/> + <button label="Ok" label_selected="Ok" name="Select"/> <string name="pick title"> Wybór: </string> diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml new file mode 100644 index 0000000000..4ba36de6fa --- /dev/null +++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_avatar"> + <string name="Subtitle"> + [AGE] + </string> + <string name="Details"> + [SL_PROFILE] + </string> + <slider name="volume_slider" tool_tip="Posiom Głośności" value="0.5"/> + <button label="Dodaj Znajomość" name="add_friend_btn"/> + <button label="IM" name="im_btn"/> + <button label="Więcej" name="view_profile_btn"/> + <panel name="moderator_panel"> + <button label="Wyłącz Komunikację Głosową" name="disable_voice"/> + <button label="Włącz Komunikację Głosową" name="enable_voice"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml new file mode 100644 index 0000000000..d434443794 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/inspect_group.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_group"> + <string name="PrivateGroup"> + Grupa Prywatna + </string> + <string name="FreeToJoin"> + Wstęp Wolny + </string> + <string name="CostToJoin"> + L$[AMOUNT] by dołączyć + </string> + <string name="YouAreMember"> + Jesteś członkiem + </string> + <button label="Dołącz" name="join_btn"/> + <button label="Opuść" name="leave_btn"/> + <button label="Zobacz Profil" name="view_profile_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml new file mode 100644 index 0000000000..0d570940c1 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_remote_object"> + <text name="object_owner_label"> + Właściciel: + </text> + <button label="Mapa" name="map_btn"/> + <button label="Zablokuj" name="block_btn"/> + <button label="Zamknij" name="close_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml new file mode 100644 index 0000000000..bd39ff7ac3 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mimetypes name="default"> + <widgetset name="web"> + <label name="web_label"> + Zawartość Przeglądarki Internetowej + </label> + <tooltip name="web_tooltip"> + To miejsce posiada zawartość internetową + </tooltip> + <playtip name="web_playtip"> + Pokaż Zawartość Przeglądarki Internetowej + </playtip> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + Film + </label> + <tooltip name="movie_tooltip"> + To miejsce posiada zawartość filmową + </tooltip> + <playtip name="movie_playtip"> + Oglądaj Film + </playtip> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Obraz + </label> + <tooltip name="image_tooltip"> + To miejsce posiada zwartość graficzną + </tooltip> + <playtip name="image_playtip"> + Zobacz zdjęcie miejsca + </playtip> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <tooltip name="audio_tooltip"> + To miejsce posiada zwartość audio + </tooltip> + <playtip name="audio_playtip"> + Rozpocznij odtwarzanie audio + </playtip> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Synchroniczne Strumienie Medialne + </label> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - Żadne - + </label> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - Żadne - + </label> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Audio + </label> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + Video + </label> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Obraz + </label> + </mimetype> + <mimetype name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + Film (QuickTime) + </label> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Skrypt Java + </label> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Ogg Audio/Video + </label> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + Dokument PDF + </label> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Dokument Postscript + </label> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Dokument RTF + </label> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Język Integracyjnej Synchronizacji Multimedialnej (SMIL) + </label> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Strona Internetowa (XHTML) + </label> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Audio (MIDI) + </label> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Audio (MP3) + </label> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Audio (AIFF) + </label> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Audio (WAV) + </label> + </mimetype> + <mimetype name="image/bmp"> + <label name="image/bmp_label"> + Obraz (BMP) + </label> + </mimetype> + <mimetype name="image/gif"> + <label name="image/gif_label"> + Obraz (GIF) + </label> + </mimetype> + <mimetype name="image/jpeg"> + <label name="image/jpeg_label"> + Obraz (JPEG) + </label> + </mimetype> + <mimetype name="image/png"> + <label name="image/png_label"> + Obraz (PNG) + </label> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Obraz (SVG) + </label> + </mimetype> + <mimetype name="image/tiff"> + <label name="image/tiff_label"> + Obraz (TIFF) + </label> + </mimetype> + <mimetype name="text/html"> + <label name="text/html_label"> + Strona Internetowa + </label> + </mimetype> + <mimetype name="text/plain"> + <label name="text/plain_label"> + Tekst + </label> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + </mimetype> + <mimetype name="video/mpeg"> + <label name="video/mpeg_label"> + Film (MPEG) + </label> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + Film (MP4) + </label> + </mimetype> + <mimetype name="video/quicktime"> + <label name="video/quicktime_label"> + Film (QuickTime) + </label> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + Film (Windows Media ASF) + </label> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + Film (Windows Media WMV) + </label> + </mimetype> + <mimetype name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + Film (AVI) + </label> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml new file mode 100644 index 0000000000..5c362ab772 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="avatar_list_item"> + <string name="FormatSeconds"> + [COUNT]s + </string> + <string name="FormatMinutes"> + [COUNT]m + </string> + <string name="FormatHours"> + [COUNT]h + </string> + <string name="FormatDays"> + [COUNT]d + </string> + <string name="FormatWeeks"> + [COUNT]tyg + </string> + <string name="FormatMonths"> + [COUNT]mc + </string> + <string name="FormatYears"> + [COUNT]lat + </string> + <text name="avatar_name" value="Nieznane"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml new file mode 100644 index 0000000000..27d8981e80 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shirt_panel"> + <panel name="avatar_shirt_color_panel"> + <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać grafikę"/> + <color_swatch label="Kolor/Odcień" name="Color/Tint" tool_tip="Kliknij by wybrać kolor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shirt_main_tab" title="Spódnica"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml new file mode 100644 index 0000000000..5efa402698 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_tattoo_panel"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatuaż Głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę"/> + <texture_picker label="Tatuaż Górnej Części Ciała" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę"/> + <texture_picker label="Tatuaż Dolnej Części Ciała" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml new file mode 100644 index 0000000000..e8e819e7ce --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="group_list_item"> + <text name="group_name" value="Nieznana"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml index dd46b4aeaa..6a0cbbd23a 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml @@ -16,7 +16,7 @@ Możesz wybrać wielu Członków naciskając Ctrl i klikając na ich imionach. <name_list name="member_list"> <name_list.columns label="Członek" name="name"/> <name_list.columns label="Dotacje" name="donated"/> - <name_list.columns label="Ostatnio w SL" name="online"/> + <name_list.columns label="Status" name="online"/> </name_list> <button label="Zaproś do Grupy" name="member_invite"/> <button label="Usuń z Grupy" name="member_eject"/> @@ -29,7 +29,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji, łącznie z funkcją Każdy i Właściciel. </panel.string> <panel.string name="cant_delete_role"> - Specjalne Funkcje Każdy i Właściciel nie mogą zostać usunięte. + Funkcje "Wszyscy" oraz "Właściciele" są domyślnie oraz nie mogą zostać usunięte. </panel.string> <panel.string name="power_folder_icon"> Inv_FolderClosed @@ -38,7 +38,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji, <scroll_list name="role_list"> <scroll_list.columns label="Funkcja" name="name"/> <scroll_list.columns label="Tytuł" name="title"/> - <scroll_list.columns label="Liczba" name="members"/> + <scroll_list.columns label="#" name="members"/> </scroll_list> <button label="Stwórz Nową Funkcję" name="role_create"/> <button label="Usuń Funkcję" name="role_delete"/> @@ -57,7 +57,7 @@ Istnieje wiele Przywilei. </tab_container> <panel name="members_footer"> <text name="static"> - Funkcje + Przypisani Członkowie </text> <scroll_list name="member_assigned_roles"> <scroll_list.columns label="" name="checkbox"/> @@ -73,13 +73,13 @@ Istnieje wiele Przywilei. </panel> <panel name="roles_footer"> <text name="static"> - Nazwa + Nazwa Funkcji </text> <line_editor name="role_name"> Liczba </line_editor> <text name="static3"> - Tytuł + Nazwa Funkcji </text> <line_editor name="role_title"> (proszę czekać) diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml new file mode 100644 index 0000000000..dc73d08680 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="landmark_info"> + <string name="title_create_landmark" value="Zapamiętaj Miejsce"/> + <string name="title_edit_landmark" value="Edytuj Zapamiętane Miejsce"/> + <string name="title_landmark" value="Zapamiętane Miejsce (LM)"/> + <string name="not_available" value="(N\A)"/> + <string name="unknown" value="(nieznane)"/> + <string name="public" value="(publiczne)"/> + <string name="server_update_text"> + Informacje o miejscu nie są dostępne bez aktualizacji serwera. + </string> + <string name="server_error_text"> + Informacje o miejscu nie są dostępne w tej chwili. Prosimy sprobować później. + </string> + <string name="server_forbidden_text"> + Informacje o miejscu są niedostępne z powodu braku dostępu. Prosimy sprawdzić swoje prawa z właścicielem posiadłości. + </string> + <string name="acquired_date"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </string> + <text name="title" value="Profil Miejsca"/> + <scroll_container name="place_scroll"> + <panel name="scrolling_panel"> + <text name="maturity_value" value="nieznany"/> + <panel name="landmark_info_panel"> + <text name="owner_label" value="Właściciel:"/> + <text name="creator_label" value="Twórca:"/> + <text name="created_label" value="Stworzone:"/> + </panel> + <panel name="landmark_edit_panel"> + <text name="title_label" value="Tytuł:"/> + <text name="notes_label" value="Moje notatki:"/> + <text name="folder_label" value="Lokalizacja zapisanego miejsca:"/> + </panel> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index cec7e34da5..42088eae28 100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -6,33 +6,29 @@ <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php </panel.string> - <panel name="login_widgets"> - <text name="first_name_text"> - Imię: - </text> - <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Imię"/> - <text name="last_name_text"> - Nazwisko - </text> - <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nazwisko"/> - <text name="password_text"> - Hasło: - </text> - <button label="Zaloguj" label_selected="Zaloguj" name="connect_btn"/> - <text name="start_location_text"> - Miejsce Startu: - </text> - <combo_box name="start_location_combo"> - <combo_box.item label="Moje Ostatnie Miejsce" name="MyLastLocation"/> - <combo_box.item label="Moje Miejsce Startu" name="MyHome"/> - <combo_box.item label="<Wpisz nazwę regionu>" name="Typeregionname"/> - </combo_box> - <check_box label="Zapamiętaj Hasło" name="remember_check"/> - <text name="create_new_account_text"> - Załóż Nowe Konto - </text> - <text name="forgot_password_text"> - Nie pamiętasz swojego imienia lub hasła? - </text> - </panel> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="first_name_text"> + Imię: + </text> + <line_editor label="Imię" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <line_editor label="Nazwisko" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <check_box label="Zapamiętaj hasło" name="remember_check"/> + <text name="start_location_text"> + Rozpocznij w: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="Moje Miejsce Startu" name="MyHome"/> + </combo_box> + <button label="Połącz" name="connect_btn"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_new_account_text"> + Utwórz nowe konto + </text> + <text name="login_help"> + Potrzebujesz pomocy z logowaniem się? + </text> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml new file mode 100644 index 0000000000..4d91c3cdc8 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Dopasuj" name="Media settings for controls"> + <text name="controls_label"> + Ustawienia: + </text> + <combo_box name="controls"> + <combo_item name="Standard"> + Standardowe + </combo_item> + <combo_item name="Mini"> + Mini + </combo_item> + </combo_box> + <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_owner_interact"/> + <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_owner_control"/> + <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_group_interact"/> + <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_group_control"/> + <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_anyone_control"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml new file mode 100644 index 0000000000..162df37e52 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Outfits"> + <accordion name="outfits_accordion"> + <accordion_tab name="tab_cof" title="Aktualne Ubranie"/> + <accordion_tab name="tab_outfits" title="Moje Ubrania"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml new file mode 100644 index 0000000000..ff65cd2abb --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_people.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray panel --> +<panel label="Ludzie" name="people_panel"> + <string name="no_people" value="Brak ludzi"/> + <string name="no_one_near" value="Nikogo w pobliżu"/> + <string name="no_friends_online" value="Brak dostępnych przyjaciół"/> + <string name="no_friends" value="Brak przyjaciół"/> + <string name="no_groups" value="Brak grup"/> + <string name="people_filter_label" value="Filtruj Ludzi"/> + <string name="groups_filter_label" value="Filtruj Grupy"/> + <filter_editor label="Filtr" name="filter_input"/> + <tab_container name="tabs"> + <panel label="W POBLIŻU" name="nearby_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="nearby_view_sort_btn" tool_tip="Opcje"/> + <button name="add_friend_btn" tool_tip="Dodaj wybranych Rezydentów do swojej listy znajomych"/> + </panel> + </panel> + <panel label="ZNAJOMI" name="friends_panel"> + <accordion name="friends_accordion"> + <accordion_tab name="tab_online" title="Dostępni"/> + <accordion_tab name="tab_all" title="Wszyscy"/> + </accordion> + <panel label="bottom_panel" name="bottom_panel"> + <button name="friends_viewsort_btn" tool_tip="Opcje"/> + <button name="add_btn" tool_tip="Zaproponuj znajomość"/> + <button name="del_btn" tool_tip="Usuń wybraną osobę ze swojej listy znajomych"/> + </panel> + </panel> + <panel label="GRUPY" name="groups_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="groups_viewsort_btn" tool_tip="Opcje"/> + <button name="plus_btn" tool_tip="Dołącz do grupy/Stwórz nową grupę"/> + <button name="activate_btn" tool_tip="Aktywuj wybraną grupę"/> + </panel> + </panel> + <panel label="OSTATNIE" name="recent_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="recent_viewsort_btn" tool_tip="Opcje"/> + <button name="add_friend_btn" tool_tip="Zaproponuj znajomość"/> + </panel> + </panel> + </tab_container> + <panel name="button_bar"> + <button label="Profil" name="view_profile_btn" tool_tip="Pokaż grafiki, grupy oraz inne informacje dostępne o Rezydentach"/> + <button label="IM" name="im_btn" tool_tip="Rozpocznij rozmowę prywatną (IM)"/> + <button label="Zadzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/> + <button label="Podziel się" name="share_btn"/> + <button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleportację"/> + <button label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/> + <button label="Konferencja Grupowa" name="chat_btn" tool_tip="Rozpocznij konferencę"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml new file mode 100644 index 0000000000..5d69c25ff3 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_picks.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Ulubione" name="panel_picks"> + <string name="no_picks" value="Brak Ulubionych"/> + <string name="no_classifieds" value="Brak Reklam"/> + <text name="empty_picks_panel_text"> + Brak ulubionych/reklam w tym miejscu + </text> + <accordion name="accordion"> + <accordion_tab name="tab_picks" title="Ulubione"/> + <accordion_tab name="tab_classifieds" title="Reklamy"/> + </accordion> + <panel label="bottom_panel" name="edit_panel"> + <button name="new_btn" tool_tip="Stwórz w obecnym miejscu nową zakładkę w ulubionych lub reklamę"/> + </panel> + <panel name="buttons_cucks"> + <button label="Info" name="info_btn" tool_tip="Pokaż info o ulubionych"/> + <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do odpowiadającego miejsca"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż odpowiadające miejsce w Mapie Świata"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index e3cdaae840..d72f13fabd 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml @@ -1,33 +1,26 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Komunikacja" name="im"> - <text name="text_box"> - Mój Status Online: + <panel.string name="log_in_to_change"> + Zaloguj się ponownie, aby zmienić + </panel.string> + <button label="Wyczyść Historię" name="clear_cache"/> + <text name="cache_size_label_l"> + (Miejsca, obrazy, przeglądarka internetowa, wyszukiwarka historii) </text> - <check_box label="Mój status online jest dostepny tylko dla Znajomych i Grup" - name="online_visibility" /> - <text name="text_box2"> - Ustawienia IM: + <check_box label="Mój status online jest dostępny tylko dla znajomych i grup do których należę" name="online_visibility"/> + <check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check"/> + <check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/> + <check_box label="Akceptuj Ciasteczka" name="cookies_enabled"/> + <check_box label="Zezwól na Automatyczne Uruchomianie Mediów Strumieniowych" name="autoplay_enabled"/> + <text name="Logs:"> + Logi: </text> - <string name="log_in_to_change"> - zaloguj się żeby zmienić - </string> - <check_box label="Wysyłaj IMy na email ([EMAIL])" name="send_im_to_email" /> - <check_box label="Dołącz IMy do Konsola Czatu" name="include_im_in_chat_console" /> - <check_box label="Pokazuj czas w IM" name="show_timestamps_check" /> - <check_box label="Powiadamiaj o zalogowanych znajomych" - name="friends_online_notify_checkbox" /> - <text name="text_box3"> - Pracuś Mówi: + <check_box label="Zapisz logi rozmów ogólnych na moim komputerze" name="log_nearby_chat"/> + <check_box label="Zapisuj logi wiadomości prywatnych (IM) na moim komputerze" name="log_instant_messages"/> + <check_box label="Pokazuj czas" name="show_timestamps_check_im"/> + <text name="log_path_desc"> + Pokazuj miejsce logu </text> - <text name="text_box4"> - Ustawienia Zapisu: - </text> - <check_box label="Zapisuj IMy" name="log_instant_messages" /> - <check_box label="Pokazuj czas w zapisie IM" name="log_instant_messages_timestamp" /> - <check_box label="Pokazuj koniec ostatniego dialogu IM" name="log_show_history" /> - <check_box label="Zapisuj czat" name="log_chat" /> - <check_box label="Pokazuj czas w zapisie czatu" name="log_chat_timestamp" /> - <check_box label="Pokazuj nowe IMy w zapisie czatu" name="log_chat_IM" /> - <check_box label="Pokazuj czas łącznie z datą" name="log_date_timestamp" /> - <button label="Lokacja" label_selected="Lokacja" name="log_path_button" /> + <button label="Przeglądaj" label_selected="Przeglądaj" name="log_path_button"/> + <button label="Lista Zablokowanych" name="block_list"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_profile.xml b/indra/newview/skins/default/xui/pl/panel_profile.xml new file mode 100644 index 0000000000..1ff115e0b5 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_profile.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Profil" name="panel_profile"> + <string name="no_partner_text" value="Brak"/> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="second_life_image_panel"> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <text name="title_rw_descr_text" value=":"/> + </panel> + <text name="me_homepage_text"> + Strona Domowa: + </text> + <text name="title_member_text" value="Członek od:"/> + <text name="title_acc_status_text" value="Status Konta:"/> + <text name="acc_status_text" value="Rezydent. Brak Danych Konta"/> + <text name="title_partner_text" value="Partner:"/> + <text name="title_groups_text" value="Groupy:"/> + </panel> + </scroll_container> + <panel name="profile_buttons_panel"> + <button label="Dodaj Znajomość" name="add_friend" tool_tip="Dodaj tego Rezydenta do znajomych"/> + <button label="IM" name="im" tool_tip="Rozpocznij rozmowę prywatną"/> + <button label="Zadzwoń" name="call" tool_tip="Zadzwoń do tego Rezydenta"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż tego Rezydenta na mapie"/> + <button label="Teleportuj" name="teleport" tool_tip="Zaoferuj Teleportację"/> + <button label="▼" name="overflow_btn" tool_tip="Zapłać lub wyślij obiekt temu Rezydentowi"/> + </panel> + <panel name="profile_me_buttons_panel"> + <button label="Edytuj Profil" name="edit_profile_btn"/> + <button label="Edytuj Wygląd" name="edit_appearance_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml index f20387dd25..31b410c931 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Umowa" name="Covenant"> <text name="estate_section_lbl"> - Majątek: + Majątek </text> <text name="estate_name_lbl"> Nazwa: @@ -26,44 +26,44 @@ Brak umowy dla tego majątku. </text_editor> <button label="Wyresetuj" name="reset_covenant"/> - <text name="covenant_help_text" bottom_delta="-6"> + <text bottom_delta="-6" name="covenant_help_text"> Zmiany w umowie zostaną wyświetlone we wszystkich posiadłościach majątku. </text> - <text name="covenant_instructions" bottom_delta="-36"> - Przeciągnij oraz wrzuć notę by zmienić umowę dla tego majątku. + <text bottom_delta="-36" name="covenant_instructions"> + Przeciągnij oraz wrzuć notkę by zmienić umowę dla tego majątku. </text> <text name="region_section_lbl"> - Region: + Region </text> <text name="region_name_lbl"> Nazwa: </text> - <text name="region_name_text" left="115"> + <text left="115" name="region_name_text"> leyla </text> <text name="region_landtype_lbl"> Typ: </text> - <text name="region_landtype_text" left="115"> + <text left="115" name="region_landtype_text"> Region Główny / Ziemia </text> <text name="region_maturity_lbl"> Rodzaj: </text> - <text name="region_maturity_text" left="115"> + <text left="115" name="region_maturity_text"> 'Adult' </text> <text name="resellable_lbl"> Odsprzedaj: </text> - <text name="resellable_clause" left="115" width="350"> + <text left="115" name="resellable_clause" width="350"> Posiadłość zakupiona w tym regionie nie może być odsprzedana. </text> <text name="changeable_lbl"> Podziel: </text> - <text name="changeable_clause" left="115" width="350"> + <text left="115" name="changeable_clause" width="350"> Posiadłość zakupiona w tym regionie nie może być łączona/dzielona. </text> diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml new file mode 100644 index 0000000000..09c3d8ad04 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="script panel"> + <panel.string name="loading"> + Ładowanie... + </panel.string> + <panel.string name="can_not_view"> + Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to "brak kopiowania". Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu. + </panel.string> + <panel.string name="public_objects_can_not_run"> + Publiczne obiekty nie mogą uruchamiać skryptów + </panel.string> + <panel.string name="script_running"> + Uruchomione + </panel.string> + <panel.string name="Title"> + Skrypt: [NAME] + </panel.string> + <text_editor name="Script Editor"> + Ładowanie... + </text_editor> + <button label="Zapisz" label_selected="Zapisz" name="Save_btn"/> + <combo_box label="Wklej..." name="Insert..."/> + <menu_bar name="script_menu"> + <menu label="Plik" name="File"> + <menu_item_call label="Zapisz" name="Save"/> + <menu_item_call label="Cofnij wszystkie zmiany" name="Revert All Changes"/> + </menu> + <menu label="Edytuj" name="Edit"> + <menu_item_call label="Cofnij" name="Undo"/> + <menu_item_call label="Do Przodu" name="Redo"/> + <menu_item_call label="Wytnij" name="Cut"/> + <menu_item_call label="Kopiuj" name="Copy"/> + <menu_item_call label="Wklej" name="Paste"/> + <menu_item_call label="Wybierz Wszystko" name="Select All"/> + <menu_item_call label="Odznacz" name="Deselect"/> + <menu_item_call label="Znajdź / Zamień..." name="Search / Replace..."/> + </menu> + <menu label="Pomoc" name="Help"> + <menu_item_call label="Pomoc..." name="Help..."/> + <menu_item_call label="Pomoc..." name="Keyword Help..."/> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml new file mode 100644 index 0000000000..369097cd0b --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray cannot show background because it is always + partially on screen to hold tab buttons. --> +<side_tray name="sidebar"> + <sidetray_tab description="Miejsce Startu." name="sidebar_home" tab_title="Home"> + <panel label="miejsce startu" name="panel_home"/> + </sidetray_tab> + <sidetray_tab description="Znajdź swoich znajomych, kontakty oraz Rezydentów w pobliżu Ciebie." name="sidebar_people" tab_title="People"> + <panel_container name="panel_container"> + <panel label="Info o Grupie" name="panel_group_info_sidetray"/> + <panel label="Zablokowani Rezydenci & Obiekty" name="panel_block_list_sidetray"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Znajdź i odwiedź miejsca, w których byłeś wcześniej." label="Miejsca" name="sidebar_places" tab_title="Places"> + <panel label="Miejsca" name="panel_places"/> + </sidetray_tab> + <sidetray_tab description="Edytuj swój publiczny profil oraz ulubione zakładki." name="sidebar_me" tab_title="My Profile"> + <panel label="Ja" name="panel_me"/> + </sidetray_tab> + <sidetray_tab description="Zmień swój obecny wygląd i ubranie." name="sidebar_appearance" tab_title="My Appearance"> + <panel label="Edytuj Wygląd" name="sidepanel_appearance"/> + </sidetray_tab> + <sidetray_tab description="Przeglądaj Szafę." name="sidebar_inventory" tab_title="My Inventory"> + <panel label="Edytuj Szafę" name="sidepanel_inventory"/> + </sidetray_tab> +</side_tray> diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml new file mode 100644 index 0000000000..e47a15b67a --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> +<panel name="panel_stand_stop_flying"> + <button label="Wstań" name="stand_btn" tool_tip="Kliknij tutaj by wstać."/> + <button label="Zatrzymaj Latanie" name="stop_fly_btn" tool_tip="Zatrzymaj Latanie"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml new file mode 100644 index 0000000000..d88d98f104 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Teleport History"> + <accordion name="history_accordion"> + <accordion_tab name="today" title="Dzisiaj"/> + <accordion_tab name="yesterday" title="Wczoraj"/> + <accordion_tab name="2_days_ago" title="2 dni temu"/> + <accordion_tab name="3_days_ago" title="3 dni temu"/> + <accordion_tab name="4_days_ago" title="4 dni temu"/> + <accordion_tab name="5_days_ago" title="5 dni temu"/> + <accordion_tab name="6_days_and_older" title="6 dni i więcej"/> + <accordion_tab name="1_month_and_older" title="1 miesiąc i więcej"/> + <accordion_tab name="6_months_and_older" title="6 miesięcy i więcej"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml new file mode 100644 index 0000000000..b70c76f652 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="item properties" title="Właściwości Obiektu w Szafie"> + <panel.string name="unknown"> + (nieznany) + </panel.string> + <panel.string name="public"> + (publiczny) + </panel.string> + <panel.string name="you_can"> + Ty możesz: + </panel.string> + <panel.string name="owner_can"> + Właściciel może: + </panel.string> + <panel.string name="acquiredDate"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> + <text name="title" value="Właściwości Obiektu"/> + <panel label=""> + <text name="LabelItemNameTitle"> + Nazwa: + </text> + <text name="LabelItemDescTitle"> + Opis: + </text> + <text name="LabelCreatorTitle"> + Twórca: + </text> + <button label="Profil..." name="BtnCreator"/> + <text name="LabelOwnerTitle"> + Właściciel: + </text> + <button label="Profil..." name="BtnOwner"/> + <text name="LabelAcquiredTitle"> + Nabyte: + </text> + <text name="LabelAcquiredDate"> + Wed May 24 12:50:46 2006 + </text> + <text name="OwnerLabel"> + Ty: + </text> + <check_box label="Edytuj" name="CheckOwnerModify"/> + <check_box label="Kopiuj" name="CheckOwnerCopy"/> + <check_box label="Oddawaj" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Każdemu: + </text> + <check_box label="Kopiuj" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Groupa: + </text> + <check_box label="Podziel się" name="CheckShareWithGroup"/> + <text name="NextOwnerLabel"> + Następny właściciel: + </text> + <check_box label="Edytuje" name="CheckNextOwnerModify"/> + <check_box label="Kopiuje" name="CheckNextOwnerCopy"/> + <check_box label="Oddaje" name="CheckNextOwnerTransfer"/> + <check_box label="Na Sprzedaż" name="CheckPurchase"/> + <combo_box name="combobox sale copy"> + <combo_box.item label="Kopia" name="Copy"/> + <combo_box.item label="Originał" name="Original"/> + </combo_box> + <spinner label="Cena:" name="Edit Cost"/> + <text name="CurrencySymbol"> + L$ + </text> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml index 5b6ce3a3ca..95bb899071 100644 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml @@ -5,7 +5,8 @@ Legenda </text> </panel> - <panel> + <panel + name="layout_panel_2"> <button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/> <text name="me_label"> Eu @@ -48,12 +49,14 @@ Público adulto </text> </panel> - <panel> + <panel + name="layout_panel_3"> <text name="find_on_map_label"> Localizar no mapa </text> </panel> - <panel> + <panel + name="layout_panel_4"> <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Mostrar amigos no mapa"> <combo_box.item label="Amigos conectados" name="item1"/> </combo_box> @@ -67,12 +70,14 @@ <button font="SansSerifSmall" label="Copiar SLurl" name="copy_slurl" tool_tip="Copia a localização atual como um SLurl para usar na web."/> <button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada" width="135"/> </panel> - <panel> + <panel + name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel> + <panel + name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml index a3d3b6f605..453c56d280 100644 --- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml @@ -49,7 +49,7 @@ <text name="maturity_value" value="(Desconhecido)"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Lote"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Classificação:"/> <text name="rating_value" value="(Desconhecido)"/> <text name="voice_label" value="Voz:"/> @@ -68,7 +68,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Região"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Região:"/> <text name="region_type_label" value="Tipo:"/> <text name="region_rating_label" value="Classificação:"/> @@ -78,7 +78,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Propriedade"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Propriedade:"/> <text name="estate_rating_label" value="Classificação:"/> <text name="estate_owner_label" value="Proprietário:"/> @@ -86,7 +86,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="À venda"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Preço:"/> <text name="area_label" value="Área:"/> <text name="traffic_label" value="Trânsito:"/> diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 0ff53f3e00..6b275bbcad 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -66,11 +66,11 @@ static void gluiCallbackWrapper( int control_id ); static bool isTexture( GLuint texture ) { bool result = false; - + // glIsTexture will sometimes return false for real textures... do this instead. if(texture != 0) result = true; - + return result; } @@ -95,24 +95,24 @@ mediaPanel::~mediaPanel() glDeleteTextures( 1, &mPickTextureHandle ); mPickTextureHandle = 0; } - + if ( isTexture( mMediaTextureHandle ) ) { std::cerr << "remMediaPanel: deleting media texture " << mMediaTextureHandle << std::endl; glDeleteTextures( 1, &mMediaTextureHandle ); mMediaTextureHandle = 0; } - + if(mPickTexturePixels) { delete mPickTexturePixels; } - + if(mMediaSource) { delete mMediaSource; } - + } //////////////////////////////////////////////////////////////////////////////// @@ -128,6 +128,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind mCurMouseY( 0 ), mFuzzyMedia( true ), mSelectedPanel( 0 ), + mDistanceCameraToSelectedGeometry( 0.0f ), mMediaBrowserControlEnableCookies( 0 ), mMediaBrowserControlBackButton( 0 ), mMediaBrowserControlForwardButton( 0 ), @@ -151,7 +152,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind //mBookmarks.push_back( std::pair< std::string, std::string >( "description", "url" ) ); // read bookmarks from file. - // note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory + // note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory // to app directory (WITHOUT build configuration dir) (this is cwd in Windows within MSVC) // For example, test_apps\llplugintest and not test_apps\llplugintest\Release // This may need to be changed for Mac/Linux builds. @@ -193,7 +194,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind // initialize linden lab APR module ll_init_apr(); - // Set up llerror logging + // Set up llerror logging { LLError::initForApplication("."); LLError::setDefaultLevel(LLError::LEVEL_INFO); @@ -273,7 +274,7 @@ void LLMediaPluginTest::reshape( int width, int height ) void LLMediaPluginTest::bindTexture(GLuint texture, GLint row_length, GLint alignment) { glEnable( GL_TEXTURE_2D ); - + glBindTexture( GL_TEXTURE_2D, texture ); glPixelStorei( GL_UNPACK_ROW_LENGTH, row_length ); glPixelStorei( GL_UNPACK_ALIGNMENT, alignment ); @@ -285,27 +286,57 @@ bool LLMediaPluginTest::checkGLError(const char *name) { bool result = false; GLenum error = glGetError(); - + if(error != GL_NO_ERROR) { // For some reason, glGenTextures is returning GL_INVALID_VALUE... std::cout << name << " ERROR 0x" << std::hex << error << std::dec << std::endl; result = true; } - + return result; } //////////////////////////////////////////////////////////////////////////////// // -void LLMediaPluginTest::drawGeometry( int panel ) +GLfloat LLMediaPluginTest::distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z ) +{ + GLdouble camera_pos_x = 0.0f; + GLdouble camera_pos_y = 0.0f; + GLdouble camera_pos_z = 0.0f; + + GLdouble modelMatrix[16]; + GLdouble projMatrix[16]; + int viewport[4]; + + glGetDoublev(GL_MODELVIEW_MATRIX, modelMatrix); + glGetDoublev(GL_PROJECTION_MATRIX, projMatrix); + glGetIntegerv(GL_VIEWPORT, viewport); + + gluUnProject( + (viewport[2]-viewport[0])/2 , (viewport[3]-viewport[1])/2, + 0.0, + modelMatrix, projMatrix, viewport, + &camera_pos_x, &camera_pos_y, &camera_pos_z ); + + GLfloat distance = + sqrt( ( camera_pos_x - point_x ) * ( camera_pos_x - point_x ) + + ( camera_pos_y - point_y ) * ( camera_pos_y - point_y ) + + ( camera_pos_z - point_z ) * ( camera_pos_z - point_z ) ); + + return distance; +} + +//////////////////////////////////////////////////////////////////////////////// +// +void LLMediaPluginTest::drawGeometry( int panel, bool selected ) { // texture coordinates for each panel GLfloat non_opengl_texture_coords[ 8 ] = { 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f }; GLfloat opengl_texture_coords[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; - + GLfloat *texture_coords = mMediaPanels[ panel ]->mAppTextureCoordsOpenGL?opengl_texture_coords:non_opengl_texture_coords; - + // base coordinates for each panel GLfloat base_vertex_pos[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; @@ -316,31 +347,35 @@ void LLMediaPluginTest::drawGeometry( int panel ) const int panel_x = ( panel / num_rows ); const int panel_y = ( panel % num_rows ); - const float spacing = 0.1f; + // default spacing is small - make it larger if checkbox set - for testing positional audio + float spacing = 0.1f; + if ( mLargePanelSpacing ) + spacing = 2.0f; + const GLfloat offset_x = num_cols * ( 1.0 + spacing ) / 2; const GLfloat offset_y = num_rows * ( 1.0 + spacing ) / 2; - + // Adjust for media aspect ratios - { + { float aspect = 1.0f; if(mMediaPanels[ panel ]->mMediaHeight != 0) { aspect = (float)mMediaPanels[ panel ]->mMediaWidth / (float)mMediaPanels[ panel ]->mMediaHeight; } - + if(aspect > 1.0f) { // media is wider than it is high -- adjust the top and bottom in for( int corner = 0; corner < 4; ++corner ) { float temp = base_vertex_pos[corner * 2 + 1]; - + if(temp < 0.5f) temp += 0.5 - (0.5f / aspect); else temp -= 0.5 - (0.5f / aspect); - + base_vertex_pos[corner * 2 + 1] = temp; } } @@ -350,7 +385,7 @@ void LLMediaPluginTest::drawGeometry( int panel ) for( int corner = 0; corner < 4; ++corner ) { float temp = base_vertex_pos[corner * 2]; - + if(temp < 0.5f) temp += 0.5f - (0.5f * aspect); else @@ -371,6 +406,15 @@ void LLMediaPluginTest::drawGeometry( int panel ) glVertex3f( x, y, 0.0f ); }; glEnd(); + + // calculate distance to this panel if it's selected + if ( selected ) + { + GLfloat point_x = base_vertex_pos[ 0 ] + panel_x * ( 1.0 + spacing ) - offset_x + spacing / 2.0f; + GLfloat point_y = base_vertex_pos[ 0 + 1 ] + panel_y * ( 1.0 + spacing ) - offset_y + spacing / 2.0f; + GLfloat point_z = 0.0f; + mDistanceCameraToSelectedGeometry = distanceToCamera( point_x, point_y, point_z ); + }; } ////////////////////////////////////////////////////////////////////////////// @@ -403,7 +447,7 @@ void LLMediaPluginTest::draw( int draw_type ) if ( draw_type == DrawTypePickTexture ) { // only bother with pick if we have something to render - // Actually, we need to pick even if we're not ready to render. + // Actually, we need to pick even if we're not ready to render. // Otherwise you can't select and remove a panel which has gone bad. //if ( mMediaPanels[ panel ]->mReadyToRender ) { @@ -420,7 +464,7 @@ void LLMediaPluginTest::draw( int draw_type ) glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); // draw geometry using pick texture - drawGeometry( panel ); + drawGeometry( panel, false ); glMatrixMode( GL_TEXTURE ); glPopMatrix(); @@ -431,13 +475,13 @@ void LLMediaPluginTest::draw( int draw_type ) { bool texture_valid = false; bool plugin_exited = false; - + if(mMediaPanels[ panel ]->mMediaSource) { texture_valid = mMediaPanels[ panel ]->mMediaSource->textureValid(); plugin_exited = mMediaPanels[ panel ]->mMediaSource->isPluginExited(); } - + // save texture matrix (changes for each panel) glMatrixMode( GL_TEXTURE ); glPushMatrix(); @@ -465,14 +509,14 @@ void LLMediaPluginTest::draw( int draw_type ) mMediaPanels[ panel ]->mTextureScaleY, 1.0f ); }; - + float intensity = plugin_exited?0.25f:1.0f; - + // highlight the selected panel if ( mSelectedPanel && ( mMediaPanels[ panel ]->mId == mSelectedPanel->mId ) ) { startPanelHighlight( intensity, intensity, 0.0f, 5.0f ); - drawGeometry( panel ); + drawGeometry( panel, true ); endPanelHighlight(); } else @@ -481,21 +525,21 @@ void LLMediaPluginTest::draw( int draw_type ) if ( !mMediaPanels[ panel ]->mReadyToRender ) { startPanelHighlight( intensity, 0.0f, 0.0f, 2.0f ); - drawGeometry( panel ); + drawGeometry( panel, false ); endPanelHighlight(); } else - // just display a border around the media + // just display a border around the media { startPanelHighlight( 0.0f, intensity, 0.0f, 2.0f ); - drawGeometry( panel ); + drawGeometry( panel, false ); endPanelHighlight(); }; - + if ( mMediaPanels[ panel ]->mReadyToRender && texture_valid ) { // draw visual geometry - drawGeometry( panel ); + drawGeometry( panel, false ); } // restore texture matrix (changes for each panel) @@ -551,7 +595,7 @@ void LLMediaPluginTest::idle() // GLUI requires this if ( glutGetWindow() != mAppWindow ) glutSetWindow( mAppWindow ); - + // random creation/destruction of panels enabled? const time_t panel_timeout_time = 5; if ( mRandomPanelCount ) @@ -704,7 +748,7 @@ void LLMediaPluginTest::idle() for( int panel_index = 0; panel_index < (int)mMediaPanels.size(); ++panel_index ) { mediaPanel *panel = mMediaPanels[ panel_index ]; - + // call plugins idle function so it can potentially update itself panel->mMediaSource->idle(); @@ -717,7 +761,7 @@ void LLMediaPluginTest::idle() //std::cout << "texture invalid, skipping update..." << std::endl; } else - if ( panel && + if ( panel && ( panel->mMediaWidth != panel->mMediaSource->getWidth() || panel->mMediaHeight != panel->mMediaSource->getHeight() ) ) { @@ -733,7 +777,7 @@ void LLMediaPluginTest::idle() int y_offset = dirty_rect.mBottom; int width = dirty_rect.mRight - dirty_rect.mLeft; int height = dirty_rect.mTop - dirty_rect.mBottom; - + if((dirty_rect.mRight <= panel->mTextureWidth) && (dirty_rect.mTop <= panel->mTextureHeight)) { // Offset the pixels pointer properly @@ -752,23 +796,23 @@ void LLMediaPluginTest::idle() glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); }; - + checkGLError("glTexParameteri"); - + if(panel->mMediaSource->getTextureFormatSwapBytes()) { glPixelStorei(GL_UNPACK_SWAP_BYTES, 1); checkGLError("glPixelStorei"); } - + // draw portion that changes into texture - glTexSubImage2D( GL_TEXTURE_2D, 0, - x_offset, + glTexSubImage2D( GL_TEXTURE_2D, 0, + x_offset, y_offset, - width, + width, height, - panel->mMediaSource->getTextureFormatPrimary(), - panel->mMediaSource->getTextureFormatType(), + panel->mMediaSource->getTextureFormatPrimary(), + panel->mMediaSource->getTextureFormatType(), pixels ); if(checkGLError("glTexSubImage2D")) @@ -788,9 +832,9 @@ void LLMediaPluginTest::idle() glPixelStorei(GL_UNPACK_SWAP_BYTES, 0); checkGLError("glPixelStorei"); } - + panel->mMediaSource->resetDirty(); - + panel->mReadyToRender = true; } else @@ -811,8 +855,8 @@ void LLMediaPluginTest::idle() //////////////////////////////////////////////////////////////////////////////// // -void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, - int& media_x, int& media_y, +void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, + int& media_x, int& media_y, int& id ) { if ( ! mSelectedPanel ) @@ -828,7 +872,7 @@ void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, // OpenGL app == coordinate system this way // NOTE: unrelated to settings in plugin - this // is just for this app - mCurMouseY = mWindowHeight - window_y; + mCurMouseY = mWindowHeight - window_y; // extract x (0..1023, y (0..1023) and id (0..15) from RGB components unsigned long pixel_read_color_bits = ( mPixelReadColor[ 0 ] << 16 ) | ( mPixelReadColor[ 1 ] << 8 ) | mPixelReadColor[ 2 ]; @@ -880,14 +924,14 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel ) mSelectedPanel->mMediaSource->setVolume( 0.0f ); mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_LOW ); }; - + mSelectedPanel = panel; if( mSelectedPanel && mSelectedPanel->mMediaSource ) { mSelectedPanel->mMediaSource->setVolume( (float)mMediaTimeControlVolume / 100.0f ); mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_NORMAL ); - + if(!mSelectedPanel->mStartUrl.empty()) { mUrlEdit->set_text(const_cast<char*>(mSelectedPanel->mStartUrl.c_str()) ); @@ -900,7 +944,7 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel ) mediaPanel* LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source ) { mediaPanel *result = NULL; - + for( int panel = 0; panel < (int)mMediaPanels.size(); ++panel ) { if ( mMediaPanels[ panel ]->mMediaSource == source ) @@ -908,7 +952,7 @@ mediaPanel* LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source ) result = mMediaPanels[ panel ]; } } - + return result; } @@ -1066,7 +1110,7 @@ void LLMediaPluginTest::gluiCallback( int control_id ) { if ( mSelectedPanel ) { - // get value from spinner + // get value from spinner float seconds_to_seek = mMediaTimeControlSeekSeconds; mSelectedPanel->mMediaSource->seek( seconds_to_seek ); mSelectedPanel->mMediaSource->start(); @@ -1194,7 +1238,7 @@ void LLMediaPluginTest::mouseButton( int button, int state, int x, int y ) windowPosToTexturePos( x, y, media_x, media_y, id ); // only select a panel if we're on a panel - // (HACK: strictly speaking this rules out clicking on + // (HACK: strictly speaking this rules out clicking on // the origin of a panel but that's very unlikely) if ( media_x > 0 && media_y > 0 ) { @@ -1327,18 +1371,18 @@ void LLMediaPluginTest::makeChrome() mGluiMediaTimeControlWindow->add_column( false ); mIdMediaTimeControlVolume = start_id++; GLUI_Spinner* spinner = mGluiMediaTimeControlWindow->add_spinner( "Volume", 2, &mMediaTimeControlVolume, mIdMediaTimeControlVolume, gluiCallbackWrapper); - spinner->set_float_limits( 0, 100 ); + spinner->set_float_limits( 0, 100 ); mGluiMediaTimeControlWindow->add_column( true ); mIdMediaTimeControlSeekSeconds = start_id++; spinner = mGluiMediaTimeControlWindow->add_spinner( "", 2, &mMediaTimeControlSeekSeconds, mIdMediaTimeControlSeekSeconds, gluiCallbackWrapper); - spinner->set_float_limits( 0, 200 ); + spinner->set_float_limits( 0, 200 ); spinner->set_w( 32 ); spinner->set_speed( 0.025f ); mGluiMediaTimeControlWindow->add_column( false ); mIdMediaTimeControlSeek = start_id++; mGluiMediaTimeControlWindow->add_button( "SEEK", mIdMediaTimeControlSeek, gluiCallbackWrapper ); mGluiMediaTimeControlWindow->add_column( false ); - + // top window - media controls for "browser" media types (e.g. web browser) mGluiMediaBrowserControlWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_TOP ); @@ -1385,6 +1429,13 @@ void LLMediaPluginTest::makeChrome() mDisableTimeout = 0; glui_window_misc_control->add_checkbox( "Disable plugin timeout", &mDisableTimeout, mIdDisableTimeout, gluiCallbackWrapper ); glui_window_misc_control->set_main_gfx_window( mAppWindow ); + glui_window_misc_control->add_column( true ); + + mIdLargePanelSpacing = start_id++; + mLargePanelSpacing = 0; + glui_window_misc_control->add_checkbox( "Large Panel Spacing", &mLargePanelSpacing, mIdLargePanelSpacing, gluiCallbackWrapper ); + glui_window_misc_control->set_main_gfx_window( mAppWindow ); + glui_window_misc_control->add_column( true ); // bottom window - status mBottomGLUIWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_BOTTOM ); @@ -1449,7 +1500,7 @@ void LLMediaPluginTest::makePickTexture( int id, GLuint* texture_handle, unsigne // std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url ) { - // default to web + // default to web std::string mime_type = "text/html"; // we may need a more advanced MIME type accessor later :-) @@ -1479,7 +1530,7 @@ std::string LLMediaPluginTest::pluginNameFromMimeType( std::string& mime_type ) else if ( mime_type == "text/html" ) plugin_name = "media_plugin_webkit.dylib"; - + #elif LL_WINDOWS std::string plugin_name( "media_plugin_null.dll" ); @@ -1523,7 +1574,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) // tell the plugin what size we asked for media_source->setSize( media_width, media_height ); - // Use the launcher start and initialize the plugin + // Use the launcher start and initialize the plugin #if LL_DARWIN || LL_LINUX std::string launcher_name( "SLPlugin" ); #elif LL_WINDOWS @@ -1580,7 +1631,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) // id wasn't found so we can use it if ( ! id_exists ) { - panel->mId = nid; + panel->mId = nid; break; }; }; @@ -1592,7 +1643,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) } else { - // now we have the ID we can use it to make the + // now we have the ID we can use it to make the // pick texture (id is baked into texture pixels) makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels ); @@ -1615,17 +1666,17 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) { // checkGLError("LLMediaPluginTest::updateMediaPanel"); - - if ( ! panel ) + + if ( ! panel ) return; - + if(!panel->mMediaSource || !panel->mMediaSource->textureValid()) { panel->mReadyToRender = false; return; } - - // take a reference copy of the plugin values since they + + // take a reference copy of the plugin values since they // might change during this lifetime of this function int plugin_media_width = panel->mMediaSource->getWidth(); int plugin_media_height = panel->mMediaSource->getHeight(); @@ -1633,18 +1684,18 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) int plugin_texture_height = panel->mMediaSource->getBitsHeight(); // If the texture isn't created or the media or texture dimensions changed AND - // the sizes are valid then we need to delete the old media texture (if necessary) + // the sizes are valid then we need to delete the old media texture (if necessary) // then make a new one. if ((panel->mMediaTextureHandle == 0 || panel->mMediaWidth != plugin_media_width || - panel->mMediaHeight != plugin_media_height || + panel->mMediaHeight != plugin_media_height || panel->mTextureWidth != plugin_texture_width || panel->mTextureHeight != plugin_texture_height) && - ( plugin_media_width > 0 && plugin_media_height > 0 && + ( plugin_media_width > 0 && plugin_media_height > 0 && plugin_texture_width > 0 && plugin_texture_height > 0 ) ) { - std::cout << "Valid media size (" << plugin_media_width << " x " << plugin_media_height - << ") and texture size (" << plugin_texture_width << " x " << plugin_texture_height + std::cout << "Valid media size (" << plugin_media_width << " x " << plugin_media_height + << ") and texture size (" << plugin_texture_width << " x " << plugin_texture_height << ") for panel with ID=" << panel->mId << " - making texture" << std::endl; // delete old GL texture @@ -1654,13 +1705,13 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) glDeleteTextures( 1, &panel->mMediaTextureHandle ); panel->mMediaTextureHandle = 0; } - + std::cerr << "before: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl; - + // make a GL texture based on the dimensions the plugin told us GLuint new_texture = 0; glGenTextures( 1, &new_texture ); - + checkGLError("glGenTextures"); std::cout << "glGenTextures returned " << new_texture << std::endl; @@ -1679,7 +1730,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) std::cerr << "after: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl; }; - + // update our record of the media and texture dimensions // NOTE: do this after we we check for sizes changes panel->mMediaWidth = plugin_media_width; @@ -1699,7 +1750,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) panel->mAppTextureCoordsOpenGL = panel->mMediaSource->getTextureCoordsOpenGL(); // Check to see if we have enough to render this panel. - // If we do, set a flag that the display functions use so + // If we do, set a flag that the display functions use so // they only render a panel with media if it's ready. if ( panel->mMediaWidth < 0 || panel->mMediaHeight < 0 || @@ -1716,26 +1767,26 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) { // no media panels so we can't change anything - have to add - if ( mMediaPanels.size() == 0 ) + if ( mMediaPanels.size() == 0 ) return; // sanity check - if ( ! panel ) + if ( ! panel ) return; - + int index; for(index = 0; index < (int)mMediaPanels.size(); index++) { if(mMediaPanels[index] == panel) break; } - + if(index >= (int)mMediaPanels.size()) { // panel isn't in mMediaPanels return; } - + std::cout << "Replacing media panel with index " << panel->mId << std::endl; int panel_id = panel->mId; @@ -1760,7 +1811,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) // tell the plugin what size we asked for media_source->setSize( media_width, media_height ); - // Use the launcher start and initialize the plugin + // Use the launcher start and initialize the plugin #if LL_DARWIN || LL_LINUX std::string launcher_name( "SLPlugin" ); #elif LL_WINDOWS @@ -1799,12 +1850,12 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) panel->mAppTextureCoordsOpenGL = false; // really need an 'undefined' state here too panel->mReadyToRender = false; - panel->mId = panel_id; - + panel->mId = panel_id; + // Replace the entry in the panels array mMediaPanels[index] = panel; - // now we have the ID we can use it to make the + // now we have the ID we can use it to make the // pick texture (id is baked into texture pixels) makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels ); @@ -1820,7 +1871,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) // void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string mime_type ) { - // Make a new media source with a random size which we'll either + // Make a new media source with a random size which we'll either // directly or the media plugin will tell us what it wants later. // Use a random size so we can test support for weird media sizes. // (Almost everything else will get filled in later once the @@ -1829,8 +1880,8 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string width = ( ( rand() % 170 ) + 30 ) * 4; height = ( ( rand() % 170 ) + 30 ) * 4; - // adjust this random size if it's a browser so we get - // a more useful size for testing.. + // adjust this random size if it's a browser so we get + // a more useful size for testing.. if ( mime_type == "text/html" || mime_type == "example/example" ) { width = ( ( rand() % 100 ) + 100 ) * 4; @@ -1843,11 +1894,11 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) { // always leave one panel - if ( mMediaPanels.size() == 1 ) + if ( mMediaPanels.size() == 1 ) return; // sanity check - don't think this can happen but see above for a case where it might... - if ( ! panel ) + if ( ! panel ) return; std::cout << "Removing media panel with index " << panel->mId << " - total panels = " << mMediaPanels.size() - 1 << std::endl; @@ -1855,7 +1906,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) if(mSelectedPanel == panel) mSelectedPanel = NULL; - delete panel; + delete panel; // remove from storage list for( int i = 0; i < (int)mMediaPanels.size(); ++i ) @@ -1867,7 +1918,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) }; }; - // select the first panel + // select the first panel selectPanel( mMediaPanels[ 0 ] ); } @@ -1887,18 +1938,20 @@ void LLMediaPluginTest::updateStatusBar() static bool cached_supports_browser_media = true; static bool cached_supports_time_media = false; static int cached_movie_time = -1; + static GLfloat cached_distance = -1.0f; static std::string cached_plugin_version = ""; - if ( + if ( cached_id == mSelectedPanel->mId && cached_media_width == mSelectedPanel->mMediaWidth && cached_media_height == mSelectedPanel->mMediaHeight && cached_texture_width == mSelectedPanel->mTextureWidth && cached_texture_height == mSelectedPanel->mTextureHeight && - cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() && + cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() && cached_supports_time_media == mSelectedPanel->mMediaSource->pluginSupportsMediaTime() && cached_plugin_version == mSelectedPanel->mMediaSource->getPluginVersion() && - cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime() + cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime() && + cached_distance == mDistanceCameraToSelectedGeometry ) { // nothing changed so don't spend time in this shitty function @@ -1906,7 +1959,7 @@ void LLMediaPluginTest::updateStatusBar() }; std::ostringstream stream( "" ); - + stream.str( "" ); stream.clear(); @@ -1927,7 +1980,15 @@ void LLMediaPluginTest::updateStatusBar() stream << " x "; stream << std::setw( 4 ) << std::setfill( '0' ); stream << mSelectedPanel->mTextureHeight; + stream << " | "; + stream << "Distance: "; + stream << std::setw( 6 ); + stream << std::setprecision( 3 ); + stream << std::setprecision( 3 ); + stream << mDistanceCameraToSelectedGeometry; + stream << " | "; + if ( mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() ) stream << "BROWSER"; else @@ -2005,7 +2066,7 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e { // Uncomment this to make things much, much quieter. // return; - + switch(event) { case MEDIA_EVENT_CONTENT_UPDATED: @@ -2065,11 +2126,11 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e case MEDIA_EVENT_CLICK_LINK_HREF: std::cerr << "Media event: MEDIA_EVENT_CLICK_LINK_HREF, uri is " << self->getClickURL() << std::endl; break; - + case MEDIA_EVENT_CLICK_LINK_NOFOLLOW: std::cerr << "Media event: MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << std::endl; break; - + case MEDIA_EVENT_PLUGIN_FAILED: std::cerr << "Media event: MEDIA_EVENT_PLUGIN_FAILED" << std::endl; break; @@ -2195,13 +2256,13 @@ int main( int argc, char* argv[] ) glutSetWindow( app_window_handle ); gApplication = new LLMediaPluginTest( app_window_handle, app_window_width, app_window_height ); - + // update at approximately 60hz int update_ms = 1000 / 60; - + GLUI_Master.set_glutTimerFunc( update_ms, glutIdle, update_ms); glutMainLoop(); - + delete gApplication; } diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h index c2b2baba95..e7c7699343 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.h +++ b/indra/test_apps/llplugintest/llmediaplugintest.h @@ -89,7 +89,7 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner void bindTexture(GLuint texture, GLint row_length = 0, GLint alignment = 1); bool checkGLError(const char *name = "OpenGL"); - void drawGeometry( int panel ); + void drawGeometry( int panel, bool selected ); void startPanelHighlight( float red, float green, float blue, float line_width ); void endPanelHighlight(); enum { DrawTypePickTexture, DrawTypeMediaTexture }; @@ -113,6 +113,9 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner void dumpPanelInfo(); void updateStatusBar(); + GLfloat distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z ); + + // Inherited from LLPluginClassMediaOwner /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent); @@ -142,6 +145,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner float mViewPos[ 3 ]; float mViewRotation[ 16 ]; + float mDistanceCameraToSelectedGeometry; + int mIdControlAddPanel; int mIdControlRemPanel; @@ -159,6 +164,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner int mRandomBookmarks; int mIdDisableTimeout; int mDisableTimeout; + int mIdLargePanelSpacing; + int mLargePanelSpacing; int mIdControlCrashPlugin; int mIdControlHangPlugin; int mIdControlExitApp; |
