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_color_picker.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_color_picker.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/da/floater_color_picker.xml | 6 |
1 files changed, 3 insertions, 3 deletions
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 46b4d55aa5..54c958c17f 100644 --- a/indra/newview/skins/default/xui/da/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="Farve Vælger">
+<floater name="ColorPicker" title="Farve vælger">
<text name="r_val_text">
Rød:
</text>
@@ -10,7 +10,7 @@ Blå:
</text>
<text name="h_val_text">
- Farve:
+ Nuance:
</text>
<text name="s_val_text">
Mætning:
@@ -20,7 +20,7 @@ </text>
<check_box label="Anvend straks" name="apply_immediate" />
<button label="" label_selected="" name="color_pipette" />
- <button label="Annuller" label_selected="Annuller" name="cancel_btn" />
+ <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
<button label="Vælg" label_selected="Vælg" name="select_btn" />
<text name="Current color:">
Nuværende Farve:
|