Commit 9dc8593a authored by Aline Bonnet's avatar Aline Bonnet Committed by gerrit2
Browse files

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
parent 9c6defe9
......@@ -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
......
......@@ -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" />
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment