Merge branch '1.7' into 1.12

ezecosystem · Nov 16, 2017 · 4bd466f · 4bd466f
2 parents 4f4242f + 8607147
commit 4bd466f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Resources/public/templates/trash.hbt b/Resources/public/templates/trash.hbt
@@ -57,6 +57,7 @@
             {{else}}
                 <p class="ez-trashview-no-content">{{translate 'trash.empty' 'trash'}}</p>
             {{/if}}
+            <p class="ez-trashview-info-message">{{translate 'trash.show_only_readable' 'trash'}}</p>
         </div>
     </div>
     <div class="ez-trashbar-container pure-u"></div>

diff --git a/Resources/translations/trash.en.xlf b/Resources/translations/trash.en.xlf
@@ -120,6 +120,12 @@
         <note>key: trash.type.label</note>
         <jms:reference-file>Resources/public/templates/trash.hbt</jms:reference-file>
       </trans-unit>
+      <trans-unit id="5a8c83bfcf9a445fd732feb7cea464ce7c59660a" resname="trash.show_only_readable">
+        <source>Note: This list includes only content that you have read access to.</source>
+        <target>Note: This list includes only content that you have read access to.</target>
+        <note>key: trash.show_only_readable</note>
+        <jms:reference-file>Resources/public/templates/trash.hbt</jms:reference-file>
+      </trans-unit>
     </body>
   </file>
 </xliff>