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.

4 files changed, 122 insertions, 3 deletions

diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index 3469323..09c7af6 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,6 +33,9 @@
         <string name="unavailable_text_label">
                 Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
         </string>
+        <string name="add_friend_string">
+                Barátokhoz ad
+        </string>
         <flyout_button label="Adatlap" name="profile_callee_btn"/>
         <button label="Hívás" name="start_call_btn"/>
         <button label="Hívás vége" name="end_call_btn"/>
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 @@
                                 Átruház
                         </string>
                         <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."/>
-                        <check_box label="Bárki mozgathatja" name="checkbox allow everyone move"/>
-                        <check_box label="Bárki másolhatja" name="checkbox allow everyone copy"/>
+                        <check_box label="Mozgathatja" name="checkbox allow everyone move"/>
+                        <check_box label="Másolás" name="checkbox allow everyone copy"/>
                         <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"/>
                         <check_box label="Eladó" name="checkbox for sale"/>
                         <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/hu/strings.xml b/linden/indra/newview/skins/default/xui/hu/strings.xml
index 730fa28..8e1dc3b 100644
--- a/linden/indra/newview/skins/default/xui/hu/strings.xml
+++ b/linden/indra/newview/skins/default/xui/hu/strings.xml
@@ -480,7 +480,7 @@
         <string name="xml_file">
                 XML fájl
         </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                 RAW fájl
         </string>
         <string name="compressed_image_files">