diff --git a/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java b/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java
index eebbe735e370dc4597b5a19fdd5da253bea6d7c5..ebe4003e2e432a529287b82516402effb4b80ed9 100644
--- a/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java
@@ -60,8 +60,8 @@ public class AboutFragment extends Fragment implements AboutView {
@BindView(R.id.copyright)
TextView mTextViewCopyright;
- @BindView(R.id.licence)
- TextView mTextViewLicence;
+ @BindView(R.id.license)
+ TextView mTextViewLicense;
@BindView(R.id.email_report)
TextView mTextViewEmailReport;
@@ -110,7 +110,7 @@ public class AboutFragment extends Fragment implements AboutView {
mAboutPresenter.unbindView();
}
- @OnClick({R.id.contribute_container, R.id.licence_container})
+ @OnClick({R.id.contribute_container, R.id.license_container})
public void webSiteToView(View view) {
Uri uriToView = null;
@@ -119,8 +119,8 @@ public class AboutFragment extends Fragment implements AboutView {
case R.id.contribute_container:
uriToView = Uri.parse(getString(R.string.ring_contribute_website));
break;
- case R.id.licence_container:
- uriToView = Uri.parse(getString(R.string.gnu_licence_website));
+ case R.id.license_container:
+ uriToView = Uri.parse(getString(R.string.gnu_license_website));
break;
}
@@ -184,8 +184,8 @@ public class AboutFragment extends Fragment implements AboutView {
}
@Override
- public void showLicence(String licence) {
- mTextViewLicence.setText(Html.fromHtml(getString(R.string.licence)));
+ public void showLicense(String license) {
+ mTextViewLicense.setText(Html.fromHtml(getString(R.string.license)));
}
@Override
diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
index 8cb9dba869afc02f63fe6354ecbf6935c0b9c648..b750046e18ee4f5f6cc74bca745fe73f490ef0e4 100644
--- a/ring-android/app/src/main/res/layout/frag_about.xml
+++ b/ring-android/app/src/main/res/layout/frag_about.xml
@@ -122,7 +122,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:background="@color/darker_gray" />
<LinearLayout
- android:id="@+id/licence_container"
+ android:id="@+id/license_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
@@ -134,12 +134,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/section_licence"
+ android:text="@string/section_license"
android:textColor="@color/color_primary_dark"
android:textSize="18sp" />
<TextView
- android:id="@+id/licence"
+ android:id="@+id/license"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="false" />
diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 44a4790ab726029cef235b3e68bf5e74605175fb..75a12bef75ebf66ff26508eab2a31dc6096c2a9a 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">الترخيص</string>
+ <string name="section_license">الترخيص</string>
<string name="sponsor_section">Ring برمجية حرّة طوّرت ودعمت بواسطة</string>
<string name="copyright_section">الحقوق محفوظة</string>
<string name="contribute_section">مساهمة</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index f384026341215ba5c89cae4295368d720d0678ce..ee0e78eeafd5c0bdfdeb197c134139f069730db0 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Лиценз</string>
+ <string name="section_license">Лиценз</string>
<string name="sponsor_section">Ring е безплатен софтуер, разработван и поддържан от</string>
<string name="copyright_section">Авторски права</string>
<string name="contribute_section">Принос</string>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index 6f656bfc66b26ab100d4c1c2ddd23e530e3a3697..0e487079d086b46676ea2225a2f9ca1fd9bbe190 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licens</string>
+ <string name="section_license">Licens</string>
<string name="sponsor_section">Ring er fri software, udviklet og støttet af</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Bidrag</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index d3f097effe6756d28df3f3feff63429a142e49ef..9ea391db88892faddc22f3091b25fcb319a0e6a4 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Lizenz</string>
+ <string name="section_license">Lizenz</string>
<string name="sponsor_section">Ring ist eine freie Software entwickelt und unterstützt von</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Mitwirken</string>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 26724a8ac473de03475297c69fdaac1b4b21a9c5..76fab35faa3a3f124a08f1240548e1663ddaa265 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Lizenz</string>
+ <string name="section_license">Lizenz</string>
<string name="sponsor_section">Ring ist freie Software, entwickelt und unterstützt durch</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Beitragen</string>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index e266c6fc12eb6d72142ea2be80b2741b86fd6c28..fc84759ae5ab2844bc6271e367e2c36a84f3db37 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence"> Άδεια</string>
+ <string name="section_license"> Άδεια</string>
<string name="sponsor_section">Το Ring είναι δωρεάν/ελεύθερο λογισμικό αναπτυγμένο και υποστηριζόμενο από</string>
<string name="copyright_section">Πνευματική ιδιοκτησία</string>
<string name="contribute_section">Πρόσφερε</string>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 175c3df6ee9ce87ef7d03d88c7953fbbeb1bb6cb..66aca32ce6cfc7c87a1c2e64b5e0f5b1971f1b7d 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licencia</string>
+ <string name="section_license">Licencia</string>
<string name="sponsor_section">Ring es un software libre desarrollado y mantenido por</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribuir</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index 761527b7ec7509efb470076fd3987aa50a8a3de1..42da9c594b646c2728dd28d6643eb221386ee608 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Lisenssi</string>
+ <string name="section_license">Lisenssi</string>
<string name="sponsor_section">Ring on vapaa ohjelma jonka on kehittänyt ja jota tukee</string>
<string name="copyright_section">Tekijänoikeus</string>
<string name="contribute_section">Tuo panoksesi</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index 6ec3583c057fcf0fccad432825b966fb2ed4b440..bfad6dcb9be55af0d2722ec1076feed4df460d35 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licence</string>
+ <string name="section_license">Licence</string>
<string name="sponsor_section">Ring est un logiciel développé et suporté par</string>
<string name="copyright_section">Droits d\'auteurs</string>
<string name="contribute_section">Contribuer</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index a4c21cad0e38d4f6383ce689bfb2c7f26816738d..1ea61dbbe8838ac8d6b1143d961e5440e4f3be47 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licence</string>
+ <string name="section_license">Licence</string>
<string name="sponsor_section">Ring est un logiciel libre développé et soutenu par</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribuer</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index d0ac301f887983965823fd1c91a227bd08d5c5b2..47f5f068dc75611fd94433ffe278d44effca4365 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licenca</string>
+ <string name="section_license">Licenca</string>
<string name="sponsor_section">Ring je slobodi software koji razvijaju i podržavaju</string>
<string name="copyright_section">Autorska prava</string>
<string name="contribute_section">Doprinesite</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index 1fc54ff2319be6a895d84ac8301b1f59ac723365..6ca1b8f2c1cb85e174843e73b9ed02fbd22a3fd8 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licensz</string>
+ <string name="section_license">Licensz</string>
<string name="sponsor_section">A Ring egy szabad szoftver, amelynek fejlesztője és támogatója:</string>
<string name="copyright_section">Jogvédelem</string>
<string name="contribute_section">Hozzájárulás</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index e27c0efa7440630e9a9dea7232a696db793745d9..8ac83ce2f41e1c11a01158eab609ba969be3fa38 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licenza</string>
+ <string name="section_license">Licenza</string>
<string name="sponsor_section">Ring è free software sviluppato e aggiornato da</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contributi</string>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 31ee8e2180c45e8e5591275c6d9e3a513101da8d..048d661bb13ae76008dc27e5c0ac3df41076afa7 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licenza</string>
+ <string name="section_license">Licenza</string>
<string name="sponsor_section">Ring è un free software sviluppato e supportato da</string>
<string name="copyright_section">Diritti d\'autore</string>
<string name="contribute_section">Contributi</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 87c867a32008dd3208d837306ec2493e2673c6a8..e0823db07e8ca3ae79bd41e7d5265dbac7fe2f9c 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licencija</string>
+ <string name="section_license">Licencija</string>
<string name="sponsor_section">Ring yra laisva programinė įranga, kurią kuria ir palaiko</string>
<string name="copyright_section">Autorių Teisės</string>
<string name="contribute_section">Talkinti</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index f40ac71da82ed342022fd4d6dff7cf0fef07a897..144f0871038285adb08caaf31ad6006f47611c1f 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Lisens</string>
+ <string name="section_license">Lisens</string>
<string name="sponsor_section">Ring er fri programvare utviklet og støttet av</string>
<string name="copyright_section">Opphavsrett</string>
<string name="contribute_section">Bidra</string>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 38bd9191c19cf6db3fc54ca5b2026297604d963a..3c9ce9d1d833a68531a21ef3e7f1904cb4d84238 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licentie</string>
+ <string name="section_license">Licentie</string>
<string name="sponsor_section">Ring is vrije software ontwikkeld en ondersteund door</string>
<string name="contribute_section">Bijdragen</string>
<string name="version_section">Versie</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index 518b1ff59d2193b7748d2ee497501707154b2db5..2686a4960fb406c6310dc04265779fedfcecf369 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licentie</string>
+ <string name="section_license">Licentie</string>
<string name="sponsor_section">Ring is vrije software ontwikkeld en ondersteund door</string>
<string name="copyright_section">Auteursrecht</string>
<string name="contribute_section">Bijdragen</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index 6ac37e8efda6ccdaae11cba5dffab69a639d7dcb..42c8a6f26fbf0882668a7b4b222e7d0a598cf44f 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licencja</string>
+ <string name="section_license">Licencja</string>
<string name="sponsor_section">Ring jest wolnym oprogramowaniem stworzonym przez</string>
<string name="copyright_section">Prawa autorskie</string>
<string name="contribute_section">Współpracuj</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index ef8c95d98bebce693afe420b0db9e75424d075d7..28567d77d7925e77344a627c3f7d6b764a8a4eb2 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licença</string>
+ <string name="section_license">Licença</string>
<string name="sponsor_section">Ring é um software livre desenvolvido e mantido por</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribua</string>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index 2811e1773ee3fd2eb46621ae08978a378edfd875..e9a40bbdd3b693de012753d76f6c2b1cb35beee2 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Лицензия</string>
+ <string name="section_license">Лицензия</string>
<string name="sponsor_section">Ring является свободным ПО, которое разрабатывается и поддерживается</string>
<string name="copyright_section">Авторское право</string>
<string name="contribute_section">Помочь проекту</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 1897d6369ec597a4ad6f039fb137f5dfae5e6f9a..2605f71118f4e7c76010542544e7136c8d00e020 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Лицензия</string>
+ <string name="section_license">Лицензия</string>
<string name="version_section">Версия</string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index 5860246fbd7be615a3ff4d46775127a508237a61..94b6f4cec4b4e579273d63b8d93d992bd24a51bc 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licenca</string>
+ <string name="section_license">Licenca</string>
<string name="sponsor_section">Ring je prosto programje, ki ga razvija in podpira</string>
<string name="copyright_section">Avtorske pravice</string>
<string name="contribute_section">Prispevaj</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 1203ee54dc09f0a4af72971d0187c43422fe7e4f..2ad07e70bf4ea12e644b61e605cb3d90684e1f68 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Licens</string>
+ <string name="section_license">Licens</string>
<string name="sponsor_section">Ring är fri mjukvara, utvecklad och understödd av</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Bidra</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index f7bc5c136a91c4ad6f63c1e28af6c9b5febe1907..9f2712dcef494a3031ff1d7b7d2d23dbf9d0fa71 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Lisans</string>
+ <string name="section_license">Lisans</string>
<string name="sponsor_section">Ring bir özgür yazılımdır ve şunun tarafından desteklenir</string>
<string name="copyright_section">Telif Hakkı</string>
<string name="contribute_section">Katkı Yap</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 36955c82191298f45726e965530e9bacf649fc24..372d444e127aaa5c658c2cca34119ca8e7008224 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">Ліцензія</string>
+ <string name="section_license">Ліцензія</string>
<string name="sponsor_section">Ring є безкоштовним програмним забезпеченням, що розроблене та пдітримується</string>
<string name="copyright_section">Авторське право</string>
<string name="contribute_section">Співробітничати</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 7c7018b4377ac047534d6b3f1c187274a1041a53..2e3ad0fa26e536833a7bdb80a80997c113122be8 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="section_licence">許可證</string>
+ <string name="section_license">許可證</string>
<string name="sponsor_section">Ring 是一個自由軟體開發並支援由</string>
<string name="copyright_section">版權</string>
<string name="contribute_section">貢獻</string>
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index 1a55f8284206385ed25695402074b4e2b9ebd839..253ab287eb617d04d7b7d7bebd5df18f4c949a33 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -24,13 +24,13 @@ along with this program; if not, write to the Free Software
<string name="app_author" translatable="false">Savoir-faire Linux Inc.</string>
<string name="app_release" translatable="false">Gaston Miron Beta 2 - %1$s</string>
<string name="app_website_contribute" translatable="false"><u>https://ring.cx/contribute</u></string>
- <string name="gnu_licence_website" translatable="false">http://www.gnu.org/licenses/gpl.html</string>
+ <string name="gnu_license_website" translatable="false">http://www.gnu.org/licenses/gpl.html</string>
<string name="ring_contribute_website" translatable="false">https://ring.cx/contribute</string>
<string name="copyright" translatable="false">2004–2016 Savoir-faire Linux Inc.</string>
<string name="feedback_section">Feedback</string>
<string name="report"><u>Send us an email</u></string>
- <string name="section_licence">Licence</string>
+ <string name="section_license">License</string>
<string name="sponsor_section">Ring is a free software developed and supported by</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribute</string>
@@ -39,7 +39,7 @@ along with this program; if not, write to the Free Software
<string name="no_browser_app_installed">No web browser app found, install one to view this page</string>
<string name="email_chooser_title">Send mail using…</string>
<string name="website_chooser_title">View website using…</string>
- <string name="licence">This software is provided \"as is\", without warranty of any kind. For details, see
+ <string name="license">This software is provided \"as is\", without warranty of any kind. For details, see
<u>GNU General Public License version 3 or later</u></string>
<!-- RingActivity -->
diff --git a/ring-android/libringclient/src/main/java/cx/ring/about/AboutPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/about/AboutPresenter.java
index 992329af51fae1e1d56950d06f1827715e87ee54..9a67c9e5da8ea2f64386da5f43ecedfc624dd2ee 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/about/AboutPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/about/AboutPresenter.java
@@ -35,7 +35,7 @@ public class AboutPresenter extends RootPresenter<AboutView> {
getView().showContribute("");
getView().showCopyright("");
getView().showFeedback("");
- getView().showLicence("");
+ getView().showLicense("");
getView().showSupport("");
getView().showRelease("");
}
diff --git a/ring-android/libringclient/src/main/java/cx/ring/about/AboutView.java b/ring-android/libringclient/src/main/java/cx/ring/about/AboutView.java
index f9efc57b1778a4bc7d34d88fa70634584e951237..f0a08ad8a2dd92dbb0a57355f0992a7c0986a835 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/about/AboutView.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/about/AboutView.java
@@ -31,7 +31,7 @@ public interface AboutView {
void showCopyright(String copyright);
- void showLicence(String licence);
+ void showLicense(String license);
void showFeedback(String feedback);