Merge branch 'development' of github.com:siacs/Conversations into development

This commit is contained in:
iNPUTmice 2014-06-24 16:14:32 +02:00
commit d23a59f159

View file

@ -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&#8230;</string> <string name="sending">enviando&#8230;</string>
<string name="announce_pgp">Renovar anuncio PGP</string> <string name="announce_pgp">Renovar anuncio PGP</string>