diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a6d600302..470a565dd 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -18,6 +18,7 @@
  - fixed #11513: white text, broken account mgmt
  - fixed #11514: Added JS-type cancel button to edit view of WebGUI::Asset::Post (Bernd Kalbfuß-Zimmermann)
  - fixed #11469: Survey Ruler
+ - fixed Shortcut i18n for the Criteria Builder.
  - fixed #11516: Shortcut Asset: Properties panel messed up in edit view
 
 7.9.1
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index ccc851018..edcdc6ab7 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -77,6 +77,7 @@ sub _drawQueryBuilder {
 
 	# Here starts the field loop
 	my $i = 1;
+    my $addLabel = $i18n->get('add', 'Asset_Wobject');
 	foreach my $field (keys %$fields) {
 		my $fieldLabel = $fields->{$field}{fieldName};
 		my $fieldType = $fields->{$field}{fieldType} || "text";
@@ -115,11 +116,15 @@ sub _drawQueryBuilder {
 		</td>
 		<td class="qbtd"></td>
 		<td class="qbtdright">
+<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
 <<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
 		<input class="qbButton" type=button value=Add onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
 =======
 		<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)" $disabled></td>
 >>>>>>> f32f209... Fix shortcut hoverhelp, javascript, and criteria builder usability.  Fixes bug #11516:lib/WebGUI/Asset/Shortcut.pm
+=======
+		<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
+>>>>>>> 08b662b... Internationalize the Add button in the Criteria builder for the Shortcut.:lib/WebGUI/Asset/Shortcut.pm
 		</tr>
 		|;
 		$i++;