Merge branch 'development' of github.com:siacs/Conversations into development
This commit is contained in:
		
						commit
						d23a59f159
					
				| @ -22,8 +22,8 @@ | |||||||
|     <string name="title_activity_conversations">Conversations</string> |     <string name="title_activity_conversations">Conversations</string> | ||||||
|     <string name="title_activity_sharewith">Compartir con Conversación</string> |     <string name="title_activity_sharewith">Compartir con Conversación</string> | ||||||
|     <string name="just_now">ahora</string> |     <string name="just_now">ahora</string> | ||||||
|     <string name="minute_ago">1 minuto</string> |     <string name="minute_ago">hace 1 min</string> | ||||||
|     <string name="minutes_ago">%d minutos</string> |     <string name="minutes_ago">hace %d mins</string> | ||||||
|     <string name="unread_conversations">conversaciones por leer</string> |     <string name="unread_conversations">conversaciones por leer</string> | ||||||
|     <string name="sending">enviando…</string> |     <string name="sending">enviando…</string> | ||||||
|     <string name="announce_pgp">Renovar anuncio PGP</string> |     <string name="announce_pgp">Renovar anuncio PGP</string> | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 iNPUTmice
						iNPUTmice