aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
diff options
context:
space:
mode:
authorJacek Antonelli2011-05-08 15:13:37 -0500
committerJacek Antonelli2011-05-08 15:50:49 -0500
commit7278f0254a3944bd2bcbf1e855fb0d90c3086a27 (patch)
tree5d7ecb81ebf1a07482f0a7d3d13acd7f18360c0b /linden/indra/newview/skins/default/xui/hu/floater_tools.xml
parentImprudence 1.3.1 released. (diff)
parentChanged version to Experimental 2011.04.19 (diff)
downloadmeta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.zip
meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.gz
meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.bz2
meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.xz
Merged Experimental branch (exp) back into main line (next).
Git thought many files (almost 100) had merge conflicts. But, after resolving the conflicts (which were mostly trivial), almost all the files turned out to be the same as in the exp branch. So, the conflicts are not listed here. Check the diff between commit 244ffe8 and this commit to see what really changed.
Diffstat (limited to 'linden/indra/newview/skins/default/xui/hu/floater_tools.xml')
-rw-r--r--linden/indra/newview/skins/default/xui/hu/floater_tools.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_tools.xml b/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
index 35adb06..e146248 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
@@ -122,8 +122,8 @@
122 Átruház 122 Átruház
123 </string> 123 </string>
124 <button label="Átruház" label_selected="Átruház" name="button deed" tool_tip="Csoporttal megosztott tárgyakat a csoport vezetője törölni tudja."/> 124 <button label="Átruház" label_selected="Átruház" name="button deed" tool_tip="Csoporttal megosztott tárgyakat a csoport vezetője törölni tudja."/>
125 <check_box label="Bárki mozgathatja" name="checkbox allow everyone move"/> 125 <check_box label="Mozgathatja" name="checkbox allow everyone move"/>
126 <check_box label="Bárki másolhatja" name="checkbox allow everyone copy"/> 126 <check_box label="Másolás" name="checkbox allow everyone copy"/>
127 <check_box label="Keresőben megjelenít" name="search_check" tool_tip="A tárgy megjelenítése a keresési eredmények között"/> 127 <check_box label="Keresőben megjelenít" name="search_check" tool_tip="A tárgy megjelenítése a keresési eredmények között"/>
128 <check_box label="Eladó" name="checkbox for sale"/> 128 <check_box label="Eladó" name="checkbox for sale"/>
129 <text name="Cost"> 129 <text name="Cost">