diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/da/floater_texture_ctrl.xml | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
Diffstat (limited to 'indra/newview/skins/default/xui/da/floater_texture_ctrl.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/da/floater_texture_ctrl.xml | 8 |
1 files changed, 4 insertions, 4 deletions
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 aaa6fd253a..1fb5bc01a4 100644 --- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="texture picker" title="Vælg: Tekstur">
<string name="choose_picture">
- Vælg et billede
+ Klik for at vælge et billede
</string>
<text type="string" length="1" name="Multiple">
Flere
@@ -12,11 +12,11 @@ <button label="Standard" label_selected="Standard" name="Default" />
<button label="Ingen" label_selected="Ingen" name="None" />
<button label="Blank" label_selected="Blank" name="Blank" />
- <check_box label="Vis Mapper" name="show_folders_check" />
+ <check_box label="Vis mapper" name="show_folders_check" />
<search_editor label="Skriv her for at søge" name="inventory search editor" />
- <check_box label="Anvend Omgående" name="apply_immediate_check" />
+ <check_box label="Benyt straks" name="apply_immediate_check" />
<button label="" label_selected="" name="Pipette" />
- <button label="Annuller" label_selected="Annuller" name="Cancel" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
<button label="Vælg" label_selected="Vælg" name="Select" />
<string name="pick title">
Vælg:
|