From f31a5a2550ced10e8b42fff9f2ca5139b5eff112 Mon Sep 17 00:00:00 2001 From: jacques Date: Tue, 1 Mar 2022 20:43:32 +0100 Subject: [PATCH] Fix some typos --- .../net/foucry/pilldroid/DrugDetailFragment.java | 12 ++++++------ .../main/res/layout/activity_custom_scanner.xml | 2 +- app/src/main/res/layout/welcome3.xml | 2 +- app/src/main/res/layout/welcome9.xml | 2 +- app/src/main/res/values-fr-rFR/strings.xml | 14 +++++++------- app/src/main/res/values/strings.xml | 16 ++++++++-------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/net/foucry/pilldroid/DrugDetailFragment.java b/app/src/main/java/net/foucry/pilldroid/DrugDetailFragment.java index 9466bb8..04a74e1 100644 --- a/app/src/main/java/net/foucry/pilldroid/DrugDetailFragment.java +++ b/app/src/main/java/net/foucry/pilldroid/DrugDetailFragment.java @@ -80,13 +80,13 @@ public class DrugDetailFragment extends Fragment { presentationView = detailView.findViewById(R.id.presentation_cell); TextView presentationLabel = presentationView.findViewById(R.id.label); TextView presentationValue = presentationView.findViewById(R.id.value); - presentationLabel.setText(R.string.drug_presention_labal); + presentationLabel.setText(R.string.drug_presentation_label); presentationValue.setText(drug.getPresentation()); adminModeView = detailView.findViewById(R.id.administration_cell); TextView adminModeLabel = adminModeView.findViewById(R.id.label); TextView adminModeValue = adminModeView.findViewById(R.id.value); - adminModeLabel.setText(R.string.drug_administationMode_label); + adminModeLabel.setText(R.string.drug_administrationMode_label); adminModeValue.setText(drug.getAdministration_mode()); stockView = detailView.findViewById(R.id.stock_cell); @@ -108,17 +108,17 @@ public class DrugDetailFragment extends Fragment { warningView = detailView.findViewById(R.id.warning_cell); TextView warningLibelle = warningView.findViewById(R.id.label); TextView warningValue = warningView.findViewById(R.id.value); - warningLibelle.setText(R.string.drug_warningTherehold_label); + warningLibelle.setText(R.string.drug_warningThreshold_label); warningValue.setText(Integer.toString(drug.getWarnThreshold())); - warningValue.setHint(R.string.drug_warningTherehold_label); + warningValue.setHint(R.string.drug_warningThreshold_label); warningValue.setSelectAllOnFocus(true); alertView = detailView.findViewById(R.id.alert_cell); TextView alertLibelle = alertView.findViewById(R.id.label); TextView alertValue = alertView.findViewById(R.id.value); - alertLibelle.setText(R.string.drug_alertTherehold_label); + alertLibelle.setText(R.string.drug_alertThreshold_label); alertValue.setText(Integer.toString(drug.getAlertThreshold())); - alertValue.setHint(R.string.drug_alertTherehold_label); + alertValue.setHint(R.string.drug_alertThreshold_label); alertValue.setSelectAllOnFocus(true); } diff --git a/app/src/main/res/layout/activity_custom_scanner.xml b/app/src/main/res/layout/activity_custom_scanner.xml index c4d5e1a..298d8c5 100644 --- a/app/src/main/res/layout/activity_custom_scanner.xml +++ b/app/src/main/res/layout/activity_custom_scanner.xml @@ -22,7 +22,7 @@ android:layout_marginEnd="@dimen/fab_margin" android:layout_marginBottom="@dimen/fab_margin" android:backgroundTint="@android:color/transparent" - android:contentDescription="@string/flashlighButton" + android:contentDescription="@string/flashlightButton" android:onClick="switchFlashlight" android:src="@drawable/ic_baseline_highlight_24" /> diff --git a/app/src/main/res/layout/welcome3.xml b/app/src/main/res/layout/welcome3.xml index 2aa71b6..e1ab90f 100644 --- a/app/src/main/res/layout/welcome3.xml +++ b/app/src/main/res/layout/welcome3.xml @@ -10,7 +10,7 @@ Détail Médicament Annuler OK - Présentation + Présentation Nom - Mode d\'adminitration + Mode d\'adminitration Médicament introuvable dans la base de données À propos Aide Prise - Seuil critique - Seuil d\'alerte + Seuil critique + Seuil d\'alerte Médicament trouvé dans la base de données Stock courant Vous devez passer à la pharmacie Utilisez le clavier Vue de détail Enrefistrez - Allumez/Éteignez le Flash + Allumez/Éteignez le Flash Enter cip 13 here.. Enter CIP 13 @@ -42,12 +42,12 @@ L\'icône Plus Pour trouver le CIP13 Visage souriant - Icône de code barre + Icône de code barre icône de QR-Code Visage neutre Visage grincheux Capture d\'écran sur la partie information du médicament - Réglages + Réglages Mettre la prise à zéro suspend le traitement et les calculs de stock Icône de traitemernt suspendu Pour enregistrer les changements, utilisez l\'icône de sauvegarde diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d7a7123..d4070ac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,16 +8,16 @@ Help You have to go to the pharmacy Name - Presentation - Administration mode + Presentation + Administration mode Current stock Take - Alert threshold - Critical threshold + Alert threshold + Critical threshold "Use the keyboard" Detail view Save - Toggle Flash + Toggle Flash Enter cip 13 here.. Enter CIP 13 PillDroid_NotificationChannel @@ -25,7 +25,7 @@ Welcome on Pilldroid - The theorical Pill Stock Manager + The theoretical Pill Stock Manager To add a med, tap on the "Plus" button You\'ll add a drug to the database You can scan classic barcode @@ -43,12 +43,12 @@ The plus icon In order to find the CIP13 Happy face - Barre code icon + Barre code icon qr-code icon neutral face unhappy face Drug info screenshot - Tunables + Tunable Take to 0 to suspend treatment Treatment suspended icon To save changes