ui: change Licence into License
In the about fragment, the Licence word is changed into License.
For consistency, the variables' name are modified too.
Change-Id: Ic2b2eeda2800b38ff5f78b96e9cb6d5441c00035
Tuleap: #1420
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 eebbe73..ebe4003 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 @@
@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 @@
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 @@
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 @@
}
@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 8cb9dba..b750046 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 @@
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 @@
<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 44a4790..75a12be 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 f384026..ee0e78e 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 6f656bf..0e48707 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 d3f097e..9ea391d 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 26724a8..76fab35 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 e266c6f..fc84759 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 175c3df..66aca32 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 761527b..42da9c5 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 6ec3583..bfad6dc 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 a4c21ca..1ea61db 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 d0ac301..47f5f06 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 1fc54ff..6ca1b8f 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 e27c0ef..8ac83ce 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 31ee8e2..048d661 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 87c867a..e0823db 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 f40ac71..144f087 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 38bd919..3c9ce9d 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 518b1ff..2686a49 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 6ac37e8..42c8a6f 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 ef8c95d..28567d7 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 2811e17..e9a40bb 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 1897d63..2605f71 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 5860246..94b6f4c 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 1203ee5..2ad07e7 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 f7bc5c1..9f2712d 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 36955c8..372d444 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 7c7018b..2e3ad0f 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 1a55f82..253ab28 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 @@
<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 @@
<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 992329a..9a67c9e 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 @@
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 f9efc57..f0a08ad 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 @@
void showCopyright(String copyright);
- void showLicence(String licence);
+ void showLicense(String license);
void showFeedback(String feedback);