aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-07 10:49:40 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-07 10:49:40 +0100
commit943a01b9bf8cc5c66ad094850a3f42f790cfac14 (patch)
tree238aa877758c8a63c487257a3e2ef9360215655e
parenta22c8c04d8c15925e6048dcc5de3d8e8eb9d7055 (diff)
parenta7ee9cc41b1df38b070086dd5451bd791d305fbb (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
-rw-r--r--src/main/res/values-cs/strings.xml5
-rw-r--r--src/main/res/values-es/strings.xml5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index f35893ee2..ba8ae9980 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -381,4 +381,9 @@
<string name="enable_all_accounts">Povolit 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="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> \ No newline at end of file
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index cd67c2c98..fba7dbc8f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -381,4 +381,9 @@
<string name="enable_all_accounts">Habilitar 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="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>