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

This commit is contained in:
Daniel Gultsch 2015-01-07 10:49:40 +01:00
commit 943a01b9bf
2 changed files with 10 additions and 0 deletions

View File

@ -381,4 +381,9 @@
<string name="enable_all_accounts">Povolit všechny účty</string> <string name="enable_all_accounts">Povolit všechny účty</string>
<string name="disable_all_accounts">Vypnout všechny účty</string> <string name="disable_all_accounts">Vypnout všechny účty</string>
<string name="perform_action_with">Provést akci s</string> <string name="perform_action_with">Provést akci s</string>
<string name="no_affiliation">Nepřidružený</string>
<string name="no_role">Bez role</string>
<string name="outcast">Vyloučený</string>
<string name="member">Člen</string>
<string name="advanced_mode">Pokročilý mód</string>
</resources> </resources>

View File

@ -381,4 +381,9 @@
<string name="enable_all_accounts">Habilitar todas las cuentas</string> <string name="enable_all_accounts">Habilitar todas las cuentas</string>
<string name="disable_all_accounts">Deshabilitar todas las cuentas</string> <string name="disable_all_accounts">Deshabilitar todas las cuentas</string>
<string name="perform_action_with">Realizar acción con</string> <string name="perform_action_with">Realizar acción con</string>
<string name="no_affiliation">Sin afiliación</string>
<string name="no_role">Sin rol</string>
<string name="outcast">Rechazado</string>
<string name="member">Miembro</string>
<string name="advanced_mode">Modo avanzado</string>
</resources> </resources>