aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/res/values-es/strings.xml15
-rw-r--r--src/main/res/values/strings.xml18
2 files changed, 9 insertions, 24 deletions
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 82cc0a22..070479b8 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -256,21 +256,6 @@
<string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
<string name="title_activity_about">About Conversations</string>
<string name="pref_about_conversations_summary">Build and licensing information</string>
- <string name="pref_about_message">Conversations © 2014 Daniel Gultsch\n
- \nThis program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 3 as published
- by the Free Software Foundation.
- \nhttps://www.gnu.org/licenses/gpl-3.0.html\n
- \nOpenPGP API is licensed under the Apache License, Version 2.0
- \nhttps://www.apache.org/licenses/LICENSE-2.0\n
- \nMinidns © 2014 Rene Treffer and is provided under the WTFPL
- \nhttp://wtfpl.org\n
- \nMemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT
- License
- \nhttp://opensource.org/licenses/MIT\n
- \nDownload the full source code at
- \nhttps://github.com/siacs/Conversations
- </string>
<string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
<string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
<string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7378a4d8..4d379429 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -257,18 +257,18 @@
<string name="title_activity_about">About Conversations</string>
<string name="pref_about_conversations_summary">Build and licensing information</string>
<string name="pref_about_message">
- Conversations the very last word in instant messaging.
- \nCopyright © 2014 Daniel Gultsch
+ Conversations • the very last word in instant messaging.
+ \n\nCopyright © 2014 Daniel Gultsch
\n\nThis program is free software: you can redistribute it and/or modify
- \nit under the terms of the GNU General Public License as published by
- \nthe Free Software Foundation, either version 3 of the License, or
- \n(at your option) any later version.
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
\n\nThis program is distributed in the hope that it will be useful,
- \nbut WITHOUT ANY WARRANTY; without even the implied warranty of
- \nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- \nGNU General Public License for more details.
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
\n\nYou should have received a copy of the GNU General Public License
- \nalong with this program. If not, see https://www.gnu.org/licenses
+ along with this program. If not, see https://www.gnu.org/licenses
\n\nDownload the full source code at https://github.com/siacs/Conversations
\n\n\nLibraries
\n\nhttps://www.bouncycastle.org\n(The MIT License (MIT))