Skip to content

Commit 07ded45

Browse files
srl295srl295
authored
Merge branch 'master' into feat/core/9121-regex-map-epic-ldml
2 parents ab29171 + 4105667 commit 07ded45

File tree

9 files changed

+52
-22
lines changed

9 files changed

+52
-22
lines changed

‎HISTORY.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Keyman Version History
22

3+
## 17.0.166 alpha 2023-08-24
4+
5+
* chore(common): Update crowdin strings for French (#9505)
6+
7+
## 17.0.165 alpha 2023-08-23
8+
9+
* feat(core): add display=id (#9484)
10+
311
## 17.0.164 alpha 2023-08-22
412

513
* fix(common): don't crash on illegal unicodesets (#9492)

‎VERSION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17.0.165
1+
17.0.167

‎android/KMAPro/kMAPro/src/main/res/values-fr-rFR/strings.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<!-- app_name removed in 16.0 beta. Set in build.gradle -->
34
<!-- Context: Menu Action -->
45
<string name="action_share" comment="Menu action to send text content to another app">Partager</string>
56
<!-- Context: Menu Action -->
@@ -25,13 +26,16 @@
2526
<!-- Context: Textfield prompt (&#8230; is the ellipsis character "...") -->
2627
<string name="textview_hint" comment="Prompt to start typing">Commencez à taper ici&#8230;</string>
2728
<!-- Context: Splash screen (version/copyright info currently disabled -->
29+
<string name="splash_blank" translatable="false" comment="Blank text while version info on splash page is disabled"></string>
2830
<!-- Context: Splash screen (version/copyright info currently disabled -->
2931
<!-- Context: Text Size dialog -->
3032
<string name="text_size" comment="Current text size (number)">Taille du texte : %1$d</string>
3133
<!-- Context: Text Size dialog -->
3234
<string name="ic_text_size_up" comment="Make text bigger">Augmenter la taille du texte</string>
3335
<!-- Context: Text Size dialog -->
3436
<string name="ic_text_size_down" comment="Make text smaller">Diminuer la taille du texte</string>
37+
<!-- Context: Text Size dialog -->
38+
<string name="ic_text_size_slider" comment="Adjust text size">Text size slider</string>
3539
<!-- Context: Clear Text dialog -->
3640
<string name="all_text_will_be_cleared" comment="Erase all the text">\nTout le texte sera effacé\n</string>
3741
<!-- Context: Get Started menu -->
@@ -82,7 +86,7 @@
8286
<!-- Context: Keyman Settings menu / Spacebar caption hint -->
8387
<string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">Ne pas afficher la légende sur la barre d\'espace</string>
8488
<!-- Context: Keyman Settings menu / Haptic feedback -->
85-
<string name="haptic_feedback" comment="haptic feedback on key press">Vibrate when typing</string>
89+
<string name="haptic_feedback" comment="haptic feedback on key press">Vibrer lors de la saisie</string>
8690
<!-- Context: Keyman Settings menu -->
8791
<string name="show_banner" comment="text suggestions banner">Toujours afficher la bannière</string>
8892
<!-- Context: Keyman Settings menu -->
@@ -154,7 +158,7 @@
154158
<!-- Context: KMP Package strings -->
155159
<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>
156160
<!-- Context: KMP Package strings -->
157-
<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>
161+
<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>
158162
<!-- Context: anywhere -->
159-
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
163+
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Impossible de lancer le navigateur web</string>
160164
</resources>

‎android/KMEA/app/src/main/res/values-fr-rFR/strings.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<!-- Context: Button label -->
4646
<string name="label_update" comment="Dialog button to update a resource">Mise à jour</string>
4747
<!-- Context: No internet for updates -->
48-
<string name="no_internet_connection" comment="Internet connection missing">No internet connection</string>
48+
<string name="no_internet_connection" comment="Internet connection missing">Aucune connexion internet</string>
4949
<!-- Context: Keyboard Updates -->
5050
<string name="cannot_connect" comment="Error message when network connection fails">Impossible de se connecter au serveur Keyman !</string>
5151
<!-- Context: Keyboard Updates -->
@@ -84,7 +84,7 @@
8484
<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>
8585
<!-- Context: Query for associated dictionary -->
8686
<string name="query_associated_model" comment="Check if there's an available dictionary to download">Vérification du dictionnaire associé à télécharger</string>
87-
<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>
87+
<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>
8888
<!-- Context: Model Updates -->
8989
<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>
9090
<!-- Context: No associated dictionary found -->
@@ -128,11 +128,11 @@
128128
<!-- Context: Model Info -->
129129
<string name="confirm_delete_model" comment="Confirmation to delete a dictionary">Voulez-vous supprimer ce dictionnaire ?</string>
130130
<!-- Context: Model Deleted -->
131-
<string name="model_deleted" comment="Notification when a dictionary is deleted">Dictionary deleted</string>
131+
<string name="model_deleted" comment="Notification when a dictionary is deleted">Dictionnaire supprimé</string>
132132
<!-- Context: Language Settings Keyboard install strings -->
133133
<string name="keyboard_install_toast" comment="Notification when a keyboard is installed">Clavier %1$s installé</string>
134134
<!-- Context: Language Settings Keyboard uninstall strings -->
135-
<string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Keyboard deleted</string>
135+
<string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Clavier supprimé</string>
136136
<!-- Context: Language Settings menu strings -->
137137
<string name="enable_corrections" comment="Enable corrections from the suggestion banner">Activer les corrections</string>
138138
<!-- Context: Language Settings menu strings -->
@@ -145,7 +145,7 @@
145145
</plurals>
146146
<!-- Context: Language Settings menu substring - Check for available dictionary -->
147147
<string name="check_available_model" comment="Check for available dictionary">Vérifier les dictionnaires disponibles</string>
148-
<string name="check_model_online" comment="Check for dictionaries online">Check for dictionaries online</string>
148+
<string name="check_model_online" comment="Check for dictionaries online">Obtenir des dictionnaires en ligne</string>
149149
<!-- Context: Language Settings menu strings -->
150150
<string name="model_info_header" comment="Dictionary name">Dictionnaire : %1$s</string>
151151
<!-- Context: Language Settings menu strings -->
@@ -168,5 +168,5 @@
168168
<!-- Context: Other strings -->
169169
<string name="help_bubble_text">Appuyez ici pour changer de clavier</string>
170170
<!-- Context: anywhere -->
171-
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
171+
<string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Impossible de lancer le navigateur web</string>
172172
</resources>

‎ios/engine/KMEI/KeymanEngine/fr.lproj/Localizable.strings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"kmp-error-missing-resource" = "Ce paquet ne contient pas le clavier ou le dictionnaire demandé.";
126126

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

130130
/* Error opening a Keyman package - cannot parse contents */
131131
"kmp-error-no-metadata" = "Ce package n'a pas été correctement construit - contenu inconnu.";

‎linux/keyman-config/locale/fr_FR.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: keyman\n"
44
"Report-Msgid-Bugs-To: <[email protected]>\n"
55
"POT-Creation-Date: 2020-08-19 19:17+0200\n"
6-
"PO-Revision-Date: 2022-04-14 07:04\n"
6+
"PO-Revision-Date: 2023-08-24 01:28\n"
77
"Last-Translator: \n"
88
"Language-Team: French\n"
99
"Language: fr_FR\n"

‎mac/Keyman4MacIM/Keyman4MacIM/fr.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"message-keyboard-file-unreadable" = "Impossible de lire le fichier Keyman '%@'.";
2727

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

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

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

7070
/* message displayed to alert user to need grant accessibility permission */
71-
"privacy-alert-text" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Preferences, Security & Privacy.\nRestart your system.";
71+
"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.";

‎windows/src/desktop/kmshell/locale/fr/strings.xml‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<string name="SKButtonCancel" comment="Cancel button in message boxes">Annuler</string>
4747
<!-- Context: Formatted Messages -->
4848
<!-- String Type: FormatString -->
49+
<!-- Introduced: 16.0.47 -->
50+
<string name="SKAddremove" comment="Add or Remove languages button opens a dialog window">Ajouter ou supprimer des langues...</string>
51+
<!-- Context: Formatted Messages -->
52+
<!-- String Type: FormatString -->
4953
<!-- Introduced: 8.0.330.0 -->
5054
<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>
5155
<!-- Context: Formatted Messages -->
@@ -64,6 +68,18 @@
6468
<!-- String Type: PlainText -->
6569
<!-- Introduced: 7.0.239.0 -->
6670
<string name="S_Caption_Help" comment="Configuration dialog link to Help">Assistance</string>
71+
<!-- Context: Configuration Dialog -->
72+
<!-- String Type: PlainText -->
73+
<!-- Introduced: 16.0.47.0 -->
74+
<string name="S_Caption_Uninstall" comment="Configuration dialog link to Uninstall Keyboard">Désinstaller</string>
75+
<!-- Context: Configuration Dialog -->
76+
<!-- String Type: PlainText -->
77+
<!-- Introduced: 16.0.47.0 -->
78+
<string name="S_Caption_Enable" comment="Configuration dialog link to Enable Keyboard">Activer</string>
79+
<!-- Context: Configuration Dialog -->
80+
<!-- String Type: PlainText -->
81+
<!-- Introduced: 16.0.47.0 -->
82+
<string name="S_Caption_Disable" comment="Configuration dialog link to Disable Keyboard">Désactiver</string>
6783
<!-- Context: Configuration Dialog - Tab names -->
6884
<!-- String Type: PlainText -->
6985
<!-- Introduced: 7.0.230.0 -->
@@ -174,6 +190,10 @@
174190
<string name="S_Languages_Install" comment="Add language profile">Ajouter une langue</string>
175191
<!-- Context: Configuration Dialog - Captions -->
176192
<!-- String Type: PlainText -->
193+
<!-- Introduced: 16.0.47 -->
194+
<string name="S_Languages_Addremove" comment="Title for dialog to add or remove languages for keyboard layout">Ajouter/Supprimer des langues</string>
195+
<!-- Context: Configuration Dialog - Captions -->
196+
<!-- String Type: PlainText -->
177197
<!-- Introduced: 7.0.230.0 -->
178198
<string name="S_Caption_OnScreenKeyboard" comment="Term for the On Screen Keyboard">Clavier visuel :</string>
179199
<!-- Context: Configuration Dialog - Captions -->
@@ -223,7 +243,7 @@
223243
<!-- Context: Configuration Dialog - Keyboard Layouts tab -->
224244
<!-- String Type: PlainText -->
225245
<!-- Introduced: 8.0.287.0 -->
226-
<string name="S_Menu_Options" comment="KL option button submenu - keyboard options">Paramètres Clavier</string>
246+
<string name="S_Menu_Options" comment="KL option button submenu - keyboard options">Paramètres clavier...</string>
227247
<!-- Context: Configuration Dialog - Keyboard Layouts tab -->
228248
<!-- String Type: PlainText -->
229249
<!-- Introduced: 7.0.230.0 -->
@@ -341,7 +361,7 @@
341361
<!-- Context: Configuration Dialog - Hotkeys tab -->
342362
<!-- String Type: PlainText -->
343363
<!-- Introduced: 7.0.230.0 -->
344-
<string name="S_Hotkey_None" comment="Hotkey - text used when no hotkey set for an option">(aucun)</string>
364+
<string name="S_Hotkey_None" comment="Hotkey - text used when no hotkey set">(pas de raccourci clavier)</string>
345365
<!-- Context: Configuration Dialog - Hotkeys tab -->
346366
<!-- String Type: PlainText -->
347367
<!-- Introduced: 7.0.230.0 -->

‎windows/src/desktop/setup/locale/fr/strings.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ Redémarrer maintenant ?</string>
7272
<string name="ssDownloadingTitle">Téléchargement de %0:s</string>
7373
<!-- Parameters: %0:s: filename -->
7474
<string name="ssDownloadingText">Téléchargement de %0:s</string>
75-
<string name="ssOffline">$APPNAME L\'installation n\'a pas pu se connecter à keyman.com pour télécharger des ressources supplémentaires.
76-
77-
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.
78-
79-
Cliquez sur Annuler pour quitter l\'installation, Réessayer pour télécharger à nouveau les ressources ou Ignorer pour continuer hors ligne.</string>
75+
<string name="ssOffline">$APPNAME L\'installation n\'a pas pu se connecter à keyman.com pour télécharger des ressources supplémentaires.</string>
76+
<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>
77+
<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>
8078
</resources>

0 commit comments

Comments
 (0)