mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 03:16:10 -06:00 
			
		
		
		
	Merge branch 'dev' of github.com:jonaswinkler/paperless-ng into dev
This commit is contained in:
		@@ -1283,6 +1283,14 @@
 | 
				
			|||||||
          <context context-type="linenumber">73</context>
 | 
					          <context context-type="linenumber">73</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
 | 
					      <trans-unit datatype="html" id="7894972847287473517">
 | 
				
			||||||
 | 
					        <source>"<x equiv-text="items[0].name" id="PH"/>"</source>
 | 
				
			||||||
 | 
					        <target>"<x equiv-text="items[0].name" id="PH"/>"</target>
 | 
				
			||||||
 | 
					        <context-group purpose="location">
 | 
				
			||||||
 | 
					          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
 | 
				
			||||||
 | 
					          <context context-type="linenumber">112</context>
 | 
				
			||||||
 | 
					        </context-group>
 | 
				
			||||||
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit datatype="html" id="8639884465898458690">
 | 
					      <trans-unit datatype="html" id="8639884465898458690">
 | 
				
			||||||
        <source>"<x equiv-text="items[0].name" id="PH"/>" and "<x equiv-text="items[1].name" id="PH_1"/>"</source>
 | 
					        <source>"<x equiv-text="items[0].name" id="PH"/>" and "<x equiv-text="items[1].name" id="PH_1"/>"</source>
 | 
				
			||||||
        <target>"<x equiv-text="items[0].name" id="PH"/>" et "<x equiv-text="items[1].name" id="PH_1"/>"</target>
 | 
					        <target>"<x equiv-text="items[0].name" id="PH"/>" et "<x equiv-text="items[1].name" id="PH_1"/>"</target>
 | 
				
			||||||
@@ -1292,14 +1300,6 @@
 | 
				
			|||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
        <note from="description" priority="1">This is for messages like 'modify "tag1" and "tag2"'</note>
 | 
					        <note from="description" priority="1">This is for messages like 'modify "tag1" and "tag2"'</note>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit datatype="html" id="7894972847287473517">
 | 
					 | 
				
			||||||
        <source>"<x equiv-text="i.name" id="PH"/>"</source>
 | 
					 | 
				
			||||||
        <target>"<x equiv-text="i.name" id="PH"/>"</target>
 | 
					 | 
				
			||||||
        <context-group purpose="location">
 | 
					 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
 | 
					 | 
				
			||||||
          <context context-type="linenumber">116</context>
 | 
					 | 
				
			||||||
        </context-group>
 | 
					 | 
				
			||||||
      </trans-unit>
 | 
					 | 
				
			||||||
      <trans-unit datatype="html" id="760986369763309193">
 | 
					      <trans-unit datatype="html" id="760986369763309193">
 | 
				
			||||||
        <source>, </source>
 | 
					        <source>, </source>
 | 
				
			||||||
        <target>, </target>
 | 
					        <target>, </target>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user