Skip to content

Commit

Permalink
Merge branch 'feat/core/9121-regex-map-epic-ldml' into feat/resources…
Browse files Browse the repository at this point in the history
…/7042-add-pcm-epic-ldml
  • Loading branch information
srl295 authored Aug 24, 2023
2 parents 79adf5e + 07ded45 commit c3a4183
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 22 deletions.
8 changes: 8 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Keyman Version History

## 17.0.166 alpha 2023-08-24

* chore(common): Update crowdin strings for French (#9505)

## 17.0.165 alpha 2023-08-23

* feat(core): add display=id (#9484)

## 17.0.164 alpha 2023-08-22

* fix(common): don't crash on illegal unicodesets (#9492)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.0.165
17.0.167
10 changes: 7 additions & 3 deletions android/KMAPro/kMAPro/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- app_name removed in 16.0 beta. Set in build.gradle -->
<!-- Context: Menu Action -->
<string name="action_share" comment="Menu action to send text content to another app">Partager</string>
<!-- Context: Menu Action -->
Expand All @@ -25,13 +26,16 @@
<!-- Context: Textfield prompt (&#8230; is the ellipsis character "...") -->
<string name="textview_hint" comment="Prompt to start typing">Commencez à taper ici&#8230;</string>
<!-- Context: Splash screen (version/copyright info currently disabled -->
<string name="splash_blank" translatable="false" comment="Blank text while version info on splash page is disabled"></string>
<!-- Context: Splash screen (version/copyright info currently disabled -->
<!-- Context: Text Size dialog -->
<string name="text_size" comment="Current text size (number)">Taille du texte : %1$d</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_up" comment="Make text bigger">Augmenter la taille du texte</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_down" comment="Make text smaller">Diminuer la taille du texte</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_slider" comment="Adjust text size">Text size slider</string>
<!-- Context: Clear Text dialog -->
<string name="all_text_will_be_cleared" comment="Erase all the text">\nTout le texte sera effacé\n</string>
<!-- Context: Get Started menu -->
Expand Down Expand Up @@ -82,7 +86,7 @@
<!-- Context: Keyman Settings menu / Spacebar caption hint -->
<string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">Ne pas afficher la légende sur la barre d\'espace</string>
<!-- Context: Keyman Settings menu / Haptic feedback -->
<string name="haptic_feedback" comment="haptic feedback on key press">Vibrate when typing</string>
<string name="haptic_feedback" comment="haptic feedback on key press">Vibrer lors de la saisie</string>
<!-- Context: Keyman Settings menu -->
<string name="show_banner" comment="text suggestions banner">Toujours afficher la bannière</string>
<!-- Context: Keyman Settings menu -->
Expand Down Expand Up @@ -154,7 +158,7 @@
<!-- Context: KMP Package strings -->
<string name="invalid_metadata" comment="kmp.json metadata file is invalid or missing in package">Métadonnées non valides/manquantes dans le package</string>
<!-- Context: KMP Package strings -->
<string name="minimum_keyboard_version_not_supported" comment="Notification when keyboard has functionality not supported by current Keyman"> Keyboard requires a newer version of Keyman</string>
<string name="minimum_keyboard_version_not_supported" comment="Notification when keyboard has functionality not supported by current Keyman"> Le clavier nécessite une version plus récente de Keyman</string>
<!-- Context: anywhere -->
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Impossible de lancer le navigateur web</string>
</resources>
12 changes: 6 additions & 6 deletions android/KMEA/app/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!-- Context: Button label -->
<string name="label_update" comment="Dialog button to update a resource">Mise à jour</string>
<!-- Context: No internet for updates -->
<string name="no_internet_connection" comment="Internet connection missing">No internet connection</string>
<string name="no_internet_connection" comment="Internet connection missing">Aucune connexion internet</string>
<!-- Context: Keyboard Updates -->
<string name="cannot_connect" comment="Error message when network connection fails">Impossible de se connecter au serveur Keyman !</string>
<!-- Context: Keyboard Updates -->
Expand Down Expand Up @@ -84,7 +84,7 @@
<string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language)."> Erreur dans le clavier %1$s:%2$s pour la langue %3$s.</string>
<!-- Context: Query for associated dictionary -->
<string name="query_associated_model" comment="Check if there's an available dictionary to download">Vérification du dictionnaire associé à télécharger</string>
<string name="cannot_query_associated_model" comment="Cannot reach server to check if there's an available dictionary to download"> Cannot connect to Keyman server to check for associated dictionary to download</string>
<string name="cannot_query_associated_model" comment="Cannot reach server to check if there's an available dictionary to download"> Impossible de se connecter au serveur Keyman pour chercher un dictionnaire à télécharger</string>
<!-- Context: Model Updates -->
<string name="confirm_download_model" comment="Confirmation to download a dictionary update">Voulez-vous télécharger la dernière version de ce dictionnaire ?</string>
<!-- Context: No associated dictionary found -->
Expand Down Expand Up @@ -128,11 +128,11 @@
<!-- Context: Model Info -->
<string name="confirm_delete_model" comment="Confirmation to delete a dictionary">Voulez-vous supprimer ce dictionnaire ?</string>
<!-- Context: Model Deleted -->
<string name="model_deleted" comment="Notification when a dictionary is deleted">Dictionary deleted</string>
<string name="model_deleted" comment="Notification when a dictionary is deleted">Dictionnaire supprimé</string>
<!-- Context: Language Settings Keyboard install strings -->
<string name="keyboard_install_toast" comment="Notification when a keyboard is installed">Clavier %1$s installé</string>
<!-- Context: Language Settings Keyboard uninstall strings -->
<string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Keyboard deleted</string>
<string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Clavier supprimé</string>
<!-- Context: Language Settings menu strings -->
<string name="enable_corrections" comment="Enable corrections from the suggestion banner">Activer les corrections</string>
<!-- Context: Language Settings menu strings -->
Expand All @@ -145,7 +145,7 @@
</plurals>
<!-- Context: Language Settings menu substring - Check for available dictionary -->
<string name="check_available_model" comment="Check for available dictionary">Vérifier les dictionnaires disponibles</string>
<string name="check_model_online" comment="Check for dictionaries online">Check for dictionaries online</string>
<string name="check_model_online" comment="Check for dictionaries online">Obtenir des dictionnaires en ligne</string>
<!-- Context: Language Settings menu strings -->
<string name="model_info_header" comment="Dictionary name">Dictionnaire : %1$s</string>
<!-- Context: Language Settings menu strings -->
Expand All @@ -168,5 +168,5 @@
<!-- Context: Other strings -->
<string name="help_bubble_text">Appuyez ici pour changer de clavier</string>
<!-- Context: anywhere -->
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Impossible de lancer le navigateur web</string>
</resources>
2 changes: 1 addition & 1 deletion ios/engine/KMEI/KeymanEngine/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"kmp-error-missing-resource" = "Ce paquet ne contient pas le clavier ou le dictionnaire demandé.";

/* Error installing a Keyman package with a version of Keyman that does not support it */
"kmp-error-unsupported-keyman-version" = "This package requires a newer version of Keyman.";
"kmp-error-unsupported-keyman-version" = "Ce paquet nécessite une version plus récente de Keyman.";

/* Error opening a Keyman package - cannot parse contents */
"kmp-error-no-metadata" = "Ce package n'a pas été correctement construit - contenu inconnu.";
Expand Down
2 changes: 1 addition & 1 deletion linux/keyman-config/locale/fr_FR.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: keyman\n"
"Report-Msgid-Bugs-To: <[email protected]>\n"
"POT-Creation-Date: 2020-08-19 19:17+0200\n"
"PO-Revision-Date: 2022-04-14 07:04\n"
"PO-Revision-Date: 2023-08-24 01:28\n"
"Last-Translator: \n"
"Language-Team: French\n"
"Language: fr_FR\n"
Expand Down
6 changes: 3 additions & 3 deletions mac/Keyman4MacIM/Keyman4MacIM/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"message-keyboard-file-unreadable" = "Impossible de lire le fichier Keyman '%@'.";

/* Message displayed in Configuration window when keyboard cannot be loaded */
"message-error-loading-keyboard" = "(error loading keyboard)";
"message-error-loading-keyboard" = "(erreur lors du chargement du clavier)";

/* Message displayed in Configuration window when keyboard metadata cannot be loaded */
"message-error-unknown-metadata" = "unknown";
"message-error-unknown-metadata" = "inconnu";

/* Button text to acknowledge that .kmp file could not be read */
"button-keyboard-file-unreadable" = "OK";
Expand Down Expand Up @@ -68,4 +68,4 @@
"copyright-label" = "Droit d'auteur :";

/* message displayed to alert user to need grant accessibility permission */
"privacy-alert-text" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Preferences, Security & Privacy.\nRestart your system.";
"privacy-alert-text" = "Pour fonctionner correctement, Keyman nécessite des fonctionnalités d'accessibilité :\n\nAccorder l'accès dans les Préférences Système, Sécurité et Confidentialité.\nRedémarrez votre système.";
24 changes: 22 additions & 2 deletions windows/src/desktop/kmshell/locale/fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
<string name="SKButtonCancel" comment="Cancel button in message boxes">Annuler</string>
<!-- Context: Formatted Messages -->
<!-- String Type: FormatString -->
<!-- Introduced: 16.0.47 -->
<string name="SKAddremove" comment="Add or Remove languages button opens a dialog window">Ajouter ou supprimer des langues...</string>
<!-- Context: Formatted Messages -->
<!-- String Type: FormatString -->
<!-- Introduced: 8.0.330.0 -->
<string name="SKBalloonClickToSelectKeyboard" comment="Balloon that shows when Keyman icon is first shown during the tutorial">Cliquez sur cette icône pour sélectionner un clavier</string>
<!-- Context: Formatted Messages -->
Expand All @@ -64,6 +68,18 @@
<!-- String Type: PlainText -->
<!-- Introduced: 7.0.239.0 -->
<string name="S_Caption_Help" comment="Configuration dialog link to Help">Assistance</string>
<!-- Context: Configuration Dialog -->
<!-- String Type: PlainText -->
<!-- Introduced: 16.0.47.0 -->
<string name="S_Caption_Uninstall" comment="Configuration dialog link to Uninstall Keyboard">Désinstaller</string>
<!-- Context: Configuration Dialog -->
<!-- String Type: PlainText -->
<!-- Introduced: 16.0.47.0 -->
<string name="S_Caption_Enable" comment="Configuration dialog link to Enable Keyboard">Activer</string>
<!-- Context: Configuration Dialog -->
<!-- String Type: PlainText -->
<!-- Introduced: 16.0.47.0 -->
<string name="S_Caption_Disable" comment="Configuration dialog link to Disable Keyboard">Désactiver</string>
<!-- Context: Configuration Dialog - Tab names -->
<!-- String Type: PlainText -->
<!-- Introduced: 7.0.230.0 -->
Expand Down Expand Up @@ -174,6 +190,10 @@
<string name="S_Languages_Install" comment="Add language profile">Ajouter une langue</string>
<!-- Context: Configuration Dialog - Captions -->
<!-- String Type: PlainText -->
<!-- Introduced: 16.0.47 -->
<string name="S_Languages_Addremove" comment="Title for dialog to add or remove languages for keyboard layout">Ajouter/Supprimer des langues</string>
<!-- Context: Configuration Dialog - Captions -->
<!-- String Type: PlainText -->
<!-- Introduced: 7.0.230.0 -->
<string name="S_Caption_OnScreenKeyboard" comment="Term for the On Screen Keyboard">Clavier visuel :</string>
<!-- Context: Configuration Dialog - Captions -->
Expand Down Expand Up @@ -223,7 +243,7 @@
<!-- Context: Configuration Dialog - Keyboard Layouts tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 8.0.287.0 -->
<string name="S_Menu_Options" comment="KL option button submenu - keyboard options">Paramètres Clavier</string>
<string name="S_Menu_Options" comment="KL option button submenu - keyboard options">Paramètres clavier...</string>
<!-- Context: Configuration Dialog - Keyboard Layouts tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 7.0.230.0 -->
Expand Down Expand Up @@ -341,7 +361,7 @@
<!-- Context: Configuration Dialog - Hotkeys tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 7.0.230.0 -->
<string name="S_Hotkey_None" comment="Hotkey - text used when no hotkey set for an option">(aucun)</string>
<string name="S_Hotkey_None" comment="Hotkey - text used when no hotkey set">(pas de raccourci clavier)</string>
<!-- Context: Configuration Dialog - Hotkeys tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 7.0.230.0 -->
Expand Down
8 changes: 3 additions & 5 deletions windows/src/desktop/setup/locale/fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ Redémarrer maintenant ?</string>
<string name="ssDownloadingTitle">Téléchargement de %0:s</string>
<!-- Parameters: %0:s: filename -->
<string name="ssDownloadingText">Téléchargement de %0:s</string>
<string name="ssOffline">$APPNAME L\'installation n\'a pas pu se connecter à keyman.com pour télécharger des ressources supplémentaires.

Veuillez vérifier que vous êtes en ligne et donner à l\'installateur $APPNAME la permission pour accéder à Internet dans les paramètres de votre pare-feu.

Cliquez sur Annuler pour quitter l\'installation, Réessayer pour télécharger à nouveau les ressources ou Ignorer pour continuer hors ligne.</string>
<string name="ssOffline">$APPNAME L\'installation n\'a pas pu se connecter à keyman.com pour télécharger des ressources supplémentaires.</string>
<string name="ssOffline2">Veuillez vérifier que vous êtes en ligne et donner à l\'installateur $APPNAME la permission pour accéder à Internet dans les paramètres de votre pare-feu.</string>
<string name="ssOffline3">Cliquez sur Annuler pour quitter l\'installation, Réessayer pour télécharger à nouveau les ressources ou Ignorer pour continuer hors ligne.</string>
</resources>

0 comments on commit c3a4183

Please sign in to comment.