mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 01:12:08 +01:00 
			
		
		
		
	Merge branch 'main' into food_traceability
This commit is contained in:
		@@ -1737,8 +1737,10 @@ msgid "trusted"
 | 
			
		||||
msgstr "amigo"
 | 
			
		||||
 | 
			
		||||
#: apps/note/models/notes.py:243
 | 
			
		||||
msgid "frienship"
 | 
			
		||||
msgstr "amistad"
 | 
			
		||||
#, fuzzy
 | 
			
		||||
#| msgid "friendships"
 | 
			
		||||
msgid "friendship"
 | 
			
		||||
msgstr "amistades"
 | 
			
		||||
 | 
			
		||||
#: apps/note/models/notes.py:248
 | 
			
		||||
#, python-brace-format
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user