Scott Lawrence avatar Scott Lawrence committed 323c6ec Merge

merge changes for storm-1608

Comments (0)

Files changed (28)

Add a comment to this file

indra/newview/skins/default/xui/de/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/floater_preferences_proxy.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_cof_wearables.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_login.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_navigation_bar.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_outbox_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_preferences_setup.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_status_bar.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/sidepanel_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/widgets/badge.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/widgets/menu_bar.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/widgets/scroll_container.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/notifications.xml

File contents unchanged.

indra/newview/skins/default/xui/fr/floater_model_preview.xml

 			<button label="Parcourir..." name="lod_browse"/>
 			<combo_box name="lod_mode">
 				<combo_item name="triangle_limit">
-					Limite du triangle
+					Triangles max.
 				</combo_item>
 				<combo_item name="error_threshold">
 					Seuil d&apos;erreur
 				Opér. construction :
 			</text>
 			<text name="queue_mode_text">
-				Mode fil d&apos;attente :
+				Mode file d&apos;attente :
 			</text>
 			<combo_box name="build_operator">
 				<combo_item name="edge_collapse">
 		Frais de chargement : [FEE] L$
 	</text>
 	<button label="Réinitialiser" name="reset_btn" tool_tip="Rétablir les paramètres par défaut."/>
-	<button label="Calculer les poids et les frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
+	<button label="Calculer poids et frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
 	<button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/>
 	<button label="Annuler" name="cancel_btn"/>
 </floater>
Add a comment to this file

indra/newview/skins/default/xui/fr/notifications.xml

File contents unchanged.

indra/newview/skins/default/xui/fr/strings.xml

 		/fumer
 	</string>
 	<string name="/stretch">
-		/s&apos;étirer
+		/bailler
 	</string>
 	<string name="/whistle">
 		/siffler
Add a comment to this file

indra/newview/skins/default/xui/it/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/zh/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/zh/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/minimal/xui/en/panel_login.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/minimal/xui/en/panel_status_bar.xml

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.