Merge pull request #159 from Infomaniak/fix-some-strings

Fix some strings
Infomaniak · Nov 11, 2024 · b72ab85 · b72ab85
2 parents 019154a + 691f1ff
commit b72ab85
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/...in/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadProgressScreen.kt b/...in/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadProgressScreen.kt
@@ -117,7 +117,7 @@ private fun UploadProgressScreen(
             AdHeader(adScreenType)
 
             Spacer(modifier = Modifier.height(Margin.Medium))
-            Text(stringResource(R.string.uploadSuccessTransferInProgress))
+            Text(stringResource(R.string.uploadProgressIndication))
             Progress(progressState, totalSizeInBytes)
             Spacer(modifier = Modifier.height(Margin.Huge))
         }

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -30,7 +30,7 @@
     <string name="contentDescriptionButtonRemove">Datei entfernen</string>
     <string name="contentDescriptionButtonShowPassword">Passwort anzeigen</string>
     <string name="contentDescriptionCreateNewTransferButton">Neuer Transfer</string>
-    <string name="downloadedTransferLabel">Heruntergeladene Übertragung : %d/%d</string>
+    <string name="downloadedTransferLabel">Heruntergeladene Übertragung: %d/%d</string>
     <string name="expiresIn">Verfällt in %d Tagen</string>
     <plurals name="filesCount">
         <item quantity="one">%d Datei</item>
@@ -39,7 +39,7 @@
     <string name="firstTransferDescription">Mache deine erste Überweisung!</string>
     <string name="fromHeader">Von:</string>
     <string name="importFilesScreenTitle">Zu übertragende Dateien</string>
-    <string name="messageHeader">Nachricht :</string>
+    <string name="messageHeader">Nachricht:</string>
     <string name="myFilesTitle">Meine Dateien</string>
     <string name="noFileDescription">Fügt bis zu 50 GB an Dateien hinzu</string>
     <string name="noFileTitle">Keine Datei, keine Übertragung!</string>
@@ -91,7 +91,7 @@
     <string name="snackbarLinkCopiedToClipboard">Link in die Zwischenablage kopiert</string>
     <string name="startActivityCantHandleAction">Es wurde keine Anwendung gefunden, die diese Aktion bearbeitet</string>
     <string name="textFieldOptional">(Fakultativ)</string>
-    <string name="transferContentHeader">Inhalt der Übertragung :</string>
+    <string name="transferContentHeader">Inhalt der Übertragung:</string>
     <string name="transferExpired">Transfer abgelaufen</string>
     <string name="transferExpiredButton">Aus dem Verlauf löschen</string>
     <string name="transferExpiredDateReachedDescription">Tut mir leid, diese Übertragung ist am %s abgelaufen. Du kannst die Dateien nicht mehr herunterladen oder ansehen.</string>
@@ -118,14 +118,15 @@
     <string name="uploadCancelConfirmBottomSheetCancel">Übertragung abbrechen</string>
     <string name="uploadCancelConfirmBottomSheetClose">Schliessen und weiter</string>
     <string name="uploadCancelConfirmBottomSheetTitle">Bist du dir sicher, dass du die Überweisung rückgängig machen willst?</string>
+    <string name="uploadErrorDescription">Die Übertragung hat nicht funktioniert, gib ihr noch eine Chance. Wenn das Problem weiterhin besteht, wende dich an unseren Support.</string>
+    <string name="uploadErrorTitle">Was ist das denn?</string>
     <string name="uploadProgressDescriptionArgumentConfidentiality">einem Internet bei, das den Datenschutz und die Privatsphäre respektiert.</string>
     <string name="uploadProgressDescriptionArgumentEnergy">unsere eigenen Rechenzentren ohne Klimaanlagen</string>
     <string name="uploadProgressDescriptionArgumentIndependence">die technologische Unabhängigkeit in Europa.</string>
     <string name="uploadProgressDescriptionTemplateConfidentiality">Wir sind unabhängig und tragen zu %s</string>
     <string name="uploadProgressDescriptionTemplateEnergy">Wir entwerfen %s, um die Energieeffizienzstandards der Branche zu übertreffen.</string>
     <string name="uploadProgressDescriptionTemplateIndependence">Wir entwickeln %s Ohne Kompromisse bei Ökologie, Privatsphäre und Menschen.</string>
-    <string name="uploadErrorDescription">Die Übertragung hat nicht funktioniert, gib ihr noch eine Chance. Wenn das Problem weiterhin besteht, wende dich an unseren Support.</string>
-    <string name="uploadErrorTitle">Was ist das denn?</string>
+    <string name="uploadProgressIndication">Transfer wird durchgeführt…</string>
     <string name="uploadProgressTitleArgument">zeichnet uns aus</string>
     <string name="uploadProgressTitleTemplate">Was %s?</string>
     <plurals name="uploadSuccessEmailDescription">
@@ -136,7 +137,6 @@
     <string name="uploadSuccessLinkDescription">Lass diesen QR-Code in deiner Umgebung scannen, um deine Dateien weiterzugeben, oder kopiere den untenstehenden Link.</string>
     <string name="uploadSuccessLinkTitle">Deine Überweisung ist fertig!</string>
     <string name="uploadSuccessQrTitle">Dein QR-Code ist fertig!</string>
-    <string name="uploadSuccessTransferInProgress">Transfer wird durchgeführt…</string>
     <string name="urlAbout">https://www.infomaniak.com/de/about</string>
     <string name="urlUserReportAndroid">https://feedback.userreport.com/9abc7665-a78e-4fd2-aa41-a47a8b867fcd/#ideas/popular</string>
     <string name="version">Version</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -30,14 +30,15 @@
     <string name="contentDescriptionButtonRemove">Eliminar archivo</string>
     <string name="contentDescriptionButtonShowPassword">Mostrar contraseña</string>
     <string name="contentDescriptionCreateNewTransferButton">Nueva transferencia</string>
-    <string name="downloadedTransferLabel">Transferencia descargada : %d/%d</string>
+    <string name="downloadedTransferLabel">Transferencia descargada: %d/%d</string>
+    <string name="errorTransferPasswordLength">La contraseña debe tener entre 6 y 25 caracteres</string>
     <string name="expiresIn">Caduca en %d días</string>
     <plurals name="filesCount">
         <item quantity="one">%d archivo</item>
         <item quantity="other">%d archivos</item>
     </plurals>
     <string name="firstTransferDescription">Realice su primera transferencia</string>
-    <string name="fromHeader">De :</string>
+    <string name="fromHeader">De:</string>
     <string name="importFilesScreenTitle">Archivos para transferir</string>
     <string name="messageHeader">Mensaje:</string>
     <string name="myFilesTitle">Mis archivos</string>
@@ -91,7 +92,7 @@
     <string name="snackbarLinkCopiedToClipboard">Enlace copiado en el portapapeles</string>
     <string name="startActivityCantHandleAction">No se ha encontrado ninguna aplicación que gestione esta acción</string>
     <string name="textFieldOptional">(Opcional)</string>
-    <string name="transferContentHeader">Contenido de la transferencia :</string>
+    <string name="transferContentHeader">Contenido de la transferencia:</string>
     <string name="transferExpired">Transferencia caducada</string>
     <string name="transferExpiredButton">Borrar del historial</string>
     <string name="transferExpiredDateReachedDescription">Lo sentimos, esta transferencia expiró el %s. Ya no puede descargar ni ver los archivos.</string>
@@ -118,14 +119,15 @@
     <string name="uploadCancelConfirmBottomSheetCancel">Cancelar transferencia</string>
     <string name="uploadCancelConfirmBottomSheetClose">Cerrar y continuar</string>
     <string name="uploadCancelConfirmBottomSheetTitle">¿Estás seguro de que quieres cancelar la transferencia?</string>
+    <string name="uploadErrorDescription">La transferencia no ha funcionado, dale otra oportunidad. Si el problema persiste, ponte en contacto con nuestro equipo de asistencia.</string>
+    <string name="uploadErrorTitle">¿Pero qué, qué?</string>
     <string name="uploadProgressDescriptionArgumentConfidentiality">una Internet que respeta la confidencialidad y la privacidad.</string>
     <string name="uploadProgressDescriptionArgumentEnergy">nuestros propios centros de datos, sin aire acondicionado</string>
     <string name="uploadProgressDescriptionArgumentIndependence">la independencia tecnológica en Europa.</string>
     <string name="uploadProgressDescriptionTemplateConfidentiality">Somos independientes y contribuimos a %s</string>
     <string name="uploadProgressDescriptionTemplateEnergy">Diseñamos %s, para superar las normas de eficiencia energética del mercado.</string>
     <string name="uploadProgressDescriptionTemplateIndependence">Desarrollamos %s Sin comprometer la ecología, la privacidad ni a las personas.</string>
-    <string name="uploadErrorDescription">La transferencia no ha funcionado, dale otra oportunidad. Si el problema persiste, ponte en contacto con nuestro equipo de asistencia.</string>
-    <string name="uploadErrorTitle">¿Pero qué, qué?</string>
+    <string name="uploadProgressIndication">Transferencia en curso…</string>
     <string name="uploadProgressTitleArgument">diferencia</string>
     <string name="uploadProgressTitleTemplate">¿Qué nos %s?</string>
     <plurals name="uploadSuccessEmailDescription">
@@ -136,7 +138,6 @@
     <string name="uploadSuccessLinkDescription">Escanea este código QR a tu alrededor para compartir tus archivos o copia el enlace que aparece a continuación.</string>
     <string name="uploadSuccessLinkTitle">Su transferencia está lista</string>
     <string name="uploadSuccessQrTitle">Su código QR está listo</string>
-    <string name="uploadSuccessTransferInProgress">Transferencia en curso…</string>
     <string name="urlAbout">https://www.infomaniak.com/es/about</string>
     <string name="urlUserReportAndroid">https://feedback.userreport.com/1c462a20-7559-415e-a6e0-4b624dc38877/#ideas/popular</string>
     <string name="version">Versión</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -85,7 +85,7 @@
     <string name="settingsThemeTitle">Sélectionne un thème</string>
     <string name="settingsTitle">Paramètres</string>
     <string name="settingsValidityPeriodTitle">Défini une durée de validité par défaut pour tes transferts</string>
-    <plurals name="settingsValidityPeriodValue" tools:ignore="MissingQuantity">
+    <plurals name="settingsValidityPeriodValue">
         <item quantity="one">%d jour</item>
         <item quantity="other">%d jours</item>
     </plurals>
@@ -120,14 +120,15 @@
     <string name="uploadCancelConfirmBottomSheetCancel">Annuler le transfert</string>
     <string name="uploadCancelConfirmBottomSheetClose">Fermer et continuer</string>
     <string name="uploadCancelConfirmBottomSheetTitle">Es-tu certain de vouloir annuler le transfert ?</string>
+    <string name="uploadErrorDescription">Le transfert n’a pas fonctionné, donnes-lui une autre chance. Si le problème persiste, contacte notre support.</string>
+    <string name="uploadErrorTitle">Qu’est-ce que quoi ?</string>
     <string name="uploadProgressDescriptionArgumentConfidentiality">un Internet qui respecte la confidentialité et la vie privée.</string>
     <string name="uploadProgressDescriptionArgumentEnergy">nos propres data centers, sans climatisation</string>
     <string name="uploadProgressDescriptionArgumentIndependence">l’indépendance technologique en Europe.</string>
     <string name="uploadProgressDescriptionTemplateConfidentiality">Nous sommes indépendants et contribuons à %s</string>
     <string name="uploadProgressDescriptionTemplateEnergy">Nous concevons %s, pour dépasser les standards d’efficacité énergétique du marché.</string>
     <string name="uploadProgressDescriptionTemplateIndependence">Nous développons %s Sans compromis sur l’écologie, la vie privée et l’humain.</string>
-    <string name="uploadErrorDescription">Le transfert n’a pas fonctionné, donnes-lui une autre chance. Si le problème persiste, contacte notre support.</string>
-    <string name="uploadErrorTitle">Qu’est-ce que quoi ?</string>
+    <string name="uploadProgressIndication">Transfert en cours…</string>
     <string name="uploadProgressTitleArgument">différent</string>
     <string name="uploadProgressTitleTemplate">Ce qui nous rend %s ?</string>
     <plurals name="uploadSuccessEmailDescription">
@@ -138,7 +139,6 @@
     <string name="uploadSuccessLinkDescription">Fais scanner ce QR code autour de toi pour partager tes fichiers ou copie le lien ci-dessous.</string>
     <string name="uploadSuccessLinkTitle">Ton transfert est prêt !</string>
     <string name="uploadSuccessQrTitle">Ton QR code est prêt !</string>
-    <string name="uploadSuccessTransferInProgress">Transfert en cours…</string>
     <string name="urlAbout">https://www.infomaniak.com/fr/a-propos</string>
     <string name="urlUserReportAndroid">https://feedback.userreport.com/1c462a20-7559-415e-a6e0-4b624dc38877/#ideas/popular</string>
     <string name="version">Version</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -30,16 +30,16 @@
     <string name="contentDescriptionButtonRemove">Rimuovi il file</string>
     <string name="contentDescriptionButtonShowPassword">Mostra password</string>
     <string name="contentDescriptionCreateNewTransferButton">Nuovo trasferimento</string>
-    <string name="downloadedTransferLabel">Trasferimento scaricato : %d/%d</string>
+    <string name="downloadedTransferLabel">Trasferimento scaricato: %d/%d</string>
     <string name="expiresIn">Scade tra %d giorni</string>
     <plurals name="filesCount">
         <item quantity="one">%d file</item>
         <item quantity="other">%d file</item>
     </plurals>
     <string name="firstTransferDescription">Effettua il tuo primo trasferimento!</string>
-    <string name="fromHeader">Da :</string>
+    <string name="fromHeader">Da:</string>
     <string name="importFilesScreenTitle">File da trasferire</string>
-    <string name="messageHeader">Messaggio :</string>
+    <string name="messageHeader">Messaggio:</string>
     <string name="myFilesTitle">I miei file</string>
     <string name="noFileDescription">Aggiungere fino a 50 GB di file</string>
     <string name="noFileTitle">Nessun file, nessun trasferimento!</string>
@@ -91,14 +91,14 @@
     <string name="snackbarLinkCopiedToClipboard">Link copiato negli appunti</string>
     <string name="startActivityCantHandleAction">Non è stata trovata alcuna applicazione in grado di gestire questa azione</string>
     <string name="textFieldOptional">(Opzionale)</string>
-    <string name="transferContentHeader">Contenuto del trasferimento :</string>
+    <string name="transferContentHeader">Contenuto del trasferimento:</string>
     <string name="transferExpired">Trasferimento scaduto</string>
     <string name="transferExpiredButton">Cancellare dalla cronologia</string>
     <string name="transferExpiredDateReachedDescription">Spiacente, questo trasferimento è scaduto il %s. Non è più possibile scaricare o visualizzare i file.</string>
     <string name="transferExpiredLimitReachedDescription">Spiacente, questo trasferimento ha raggiunto il limite di %d download possibili.</string>
     <string name="transferExpiredTitle">Questo trasferimento non è più disponibile</string>
+    <string name="transferMessagePlaceholder">C’è qualche messaggio che vorresti trasmettere?</string>
     <string name="transferRecipientAddressPlaceholder">Invia i file a</string>
-    <string name="transferMessagePlaceholder">C’è qualche messaggio che vorrebbe trasmettere?</string>
     <string name="transferSendButton">Invia</string>
     <string name="transferSenderAddressPlaceholder">Il tuo indirizzo e-mail</string>
     <plurals name="transferSpaceLeft">
@@ -118,14 +118,15 @@
     <string name="uploadCancelConfirmBottomSheetCancel">Annullamento del trasferimento</string>
     <string name="uploadCancelConfirmBottomSheetClose">Chiudi e continua</string>
     <string name="uploadCancelConfirmBottomSheetTitle">Sei sicuro di voler annullare il trasferimento?</string>
+    <string name="uploadErrorDescription">Il trasferimento non ha funzionato, da un’altra possibilità. Se il problema persiste, contatta il nostro team di assistenza.</string>
+    <string name="uploadErrorTitle">Che cosa che… cosa?</string>
     <string name="uploadProgressDescriptionArgumentConfidentiality">un Internet che rispetta la riservatezza e la privacy.</string>
     <string name="uploadProgressDescriptionArgumentEnergy">i nostri data center, senza aria condizionata</string>
     <string name="uploadProgressDescriptionArgumentIndependence">l’indipendenza tecnologica in Europa.</string>
     <string name="uploadProgressDescriptionTemplateConfidentiality">Siamo indipendenti e contribuiamo a %s</string>
     <string name="uploadProgressDescriptionTemplateEnergy">Progettiamo %s, per superare gli standard di efficienza energetica del mercato.</string>
     <string name="uploadProgressDescriptionTemplateIndependence">Stiamo sviluppando %s Senza compromettere l’ecologia, la privacy e le persone.</string>
-    <string name="uploadErrorDescription">Il trasferimento non ha funzionato, da un’altra possibilità. Se il problema persiste, contatta il nostro team di assistenza.</string>
-    <string name="uploadErrorTitle">Che cosa che… cosa?</string>
+    <string name="uploadProgressIndication">Trasferimento in corso…</string>
     <string name="uploadProgressTitleArgument">diversi</string>
     <string name="uploadProgressTitleTemplate">Cosa ci rende %s?</string>
     <plurals name="uploadSuccessEmailDescription">
@@ -136,7 +137,6 @@
     <string name="uploadSuccessLinkDescription">Scansiona questo codice QR intorno a voi per condividere i vostri file o copiate il link qui sotto.</string>
     <string name="uploadSuccessLinkTitle">Il trasferimento è pronto!</string>
     <string name="uploadSuccessQrTitle">Il codice QR è pronto!</string>
-    <string name="uploadSuccessTransferInProgress">Trasferimento in corso…</string>
     <string name="urlAbout">https://www.infomaniak.com/it/about</string>
     <string name="urlUserReportAndroid">https://feedback.userreport.com/c85aa792-0f76-4923-8fe2-fae976cac9c2/#ideas/popular</string>
     <string name="version">Versione</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -123,14 +123,15 @@
     <string name="uploadCancelConfirmBottomSheetCancel">Cancel the transfer</string>
     <string name="uploadCancelConfirmBottomSheetClose">Close and continue</string>
     <string name="uploadCancelConfirmBottomSheetTitle">Are you sure you want to cancel the transfer?</string>
+    <string name="uploadErrorDescription">The transfer didn’t work, give it another chance. If the problem persists, contact our support team.</string>
+    <string name="uploadErrorTitle">Wait, what just happened?</string>
     <string name="uploadProgressDescriptionArgumentConfidentiality">Internet that respects confidentiality and privacy.</string>
     <string name="uploadProgressDescriptionArgumentEnergy">our own data centers, without air conditioning</string>
     <string name="uploadProgressDescriptionArgumentIndependence">technological independence in Europe.</string>
     <string name="uploadProgressDescriptionTemplateConfidentiality">We’re independent and contribute to an %s</string>
     <string name="uploadProgressDescriptionTemplateEnergy">We design %s, to exceed market standards for energy efficiency.</string>
     <string name="uploadProgressDescriptionTemplateIndependence">We develop %s Without compromising on ecology, privacy and people.</string>
-    <string name="uploadErrorDescription">The transfer didn’t work, give it another chance. If the problem persists, contact our support team.</string>
-    <string name="uploadErrorTitle">Wait, what just happened?</string>
+    <string name="uploadProgressIndication">Transfer in progress…</string>
     <string name="uploadProgressTitleArgument">apart</string>
     <string name="uploadProgressTitleTemplate">What sets us %s?</string>
     <plurals name="uploadSuccessEmailDescription">
@@ -141,7 +142,6 @@
     <string name="uploadSuccessLinkDescription">Scan this QR code around you to share your files, or copy the link below.</string>
     <string name="uploadSuccessLinkTitle">Your transfer is ready!</string>
     <string name="uploadSuccessQrTitle">Your QR code is ready!</string>
-    <string name="uploadSuccessTransferInProgress">Transfer in progress…</string>
     <string name="urlAbout">https://www.infomaniak.com/en/about</string>
     <string name="urlUserReportAndroid">https://feedback.userreport.com/f12466ad-db5b-4f5c-b24c-a54b0a5117ca/#ideas/popular</string>
     <string name="version">Version</string>