self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Localization

Browse Source
This commit is contained in:
Laurent Cozic 2017-07-26 22:27:03 +01:00
parent 89f1d5e6e7
commit 1cb23df869
9 changed files with 73 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CliClient/app/command-sync.js
View File

@ -25,7 +25,7 @@ class Command extends BaseCommand {
}
description() {
return _('Synchronizes with remote storage.');
return _('Synchronises with remote storage.');
}
options() {
@ -97,11 +97,11 @@ class Command extends BaseCommand {
randomFailures: args.options['random-failures'] === true,
};
this.log(_('Synchronization target: %s (%s)', Setting.enumOptionLabel('sync.target', this.syncTarget_), this.syncTarget_));
this.log(_('Synchronisation target: %s (%s)', Setting.enumOptionLabel('sync.target', this.syncTarget_), this.syncTarget_));
if (!sync) throw new Error(_('Cannot initialize synchronizer.'));
if (!sync) throw new Error(_('Cannot initialize synchroniser.'));
this.log(_('Starting synchronization...'));
this.log(_('Starting synchronisation...'));
let context = Setting.value('sync.context');
context = context ? JSON.parse(context) : {};

2
CliClient/app/command-todo.js
View File

@ -14,7 +14,7 @@ class Command extends BaseCommand {
}
description() {
return _('<action> can either be "toggle" or "clear". Use "toggle" to toggle the given todo between completed and uncompleted state (If the target is not a single note it will be converted to a todo). Use "clear" to convert the todo back to a regular note.');
return _('<action> can either be "toggle" or "clear". Use "toggle" to toggle the given todo between completed and uncompleted state (If the target is a regular note it will be converted to a todo). Use "clear" to convert the todo back to a regular note.');
}
autocomplete() {

21
CliClient/locales/en_GB.po
View File

@ -213,7 +213,7 @@ msgstr ""
msgid "Displays summary about the notes and notebooks."
msgstr ""
msgid "Synchronizes with remote storage."
msgid "Synchronises with remote storage."
msgstr ""
msgid "Sync to provided target (defaults to sync.target config value)"
@ -223,13 +223,13 @@ msgid "Synchronisation is already in progress."
msgstr ""
#, javascript-format
msgid "Synchronization target: %s (%s)"
msgid "Synchronisation target: %s (%s)"
msgstr ""
msgid "Cannot initialize synchronizer."
msgid "Cannot initialize synchroniser."
msgstr ""
msgid "Starting synchronization..."
msgid "Starting synchronisation..."
msgstr ""
msgid "Done."
@ -250,8 +250,8 @@ msgstr ""
msgid ""
"<action> can either be \"toggle\" or \"clear\". Use \"toggle\" to toggle the "
"given todo between completed and uncompleted state (If the target is not a "
"single note it will be converted to a todo). Use \"clear\" to convert the "
"given todo between completed and uncompleted state (If the target is a "
"regular note it will be converted to a todo). Use \"clear\" to convert the "
"todo back to a regular note."
msgstr ""
@ -322,7 +322,7 @@ msgid "Completed: %s"
msgstr ""
#, javascript-format
msgid "Synchronization is already in progress. State: %s"
msgid "Synchronisation is already in progress. State: %s"
msgstr ""
msgid "Conflicts"
@ -447,10 +447,10 @@ msgstr ""
msgid "Configuration"
msgstr ""
msgid "Synchronize"
msgid "Synchronise"
msgstr ""
msgid "Cancel synchronization"
msgid "Cancel synchronisation"
msgstr ""
#, javascript-format
@ -466,9 +466,6 @@ msgstr ""
msgid "Delete note?"
msgstr ""
msgid "Attach file"
msgstr ""
msgid "Delete note"
msgstr ""

76
CliClient/locales/fr_FR.po
View File

@ -39,7 +39,7 @@ msgid ""
"Command line argument \"%s\" contains both quotes and double-quotes - "
"aborting."
msgstr ""
"Paramètre de ligne de command \"%s\" contient à la fois des guillemets "
"Le paramètre de ligne de commande \"%s\" contient à la fois des guillemets "
"simples et doubles - impossible de continuer."
msgid "Provides help for a given command."
@ -68,7 +68,7 @@ msgid ""
msgstr ""
"Obtient ou modifie une valeur de configuration. Si la [valeur] n'est pas "
"fournie, la valeur de [nom] est affichée. Si ni le [nom] ni la [valeur] ne "
"sont fournies, la configuration complète est affichée."
"sont fournis, la configuration complète est affichée."
msgid "Also displays hidden config variables."
msgstr "Afficher également les variables cachées."
@ -174,7 +174,7 @@ msgid ""
"for todos, or `nt` for notes and todos (eg. `-tt` would display only the "
"todos, while `-ttd` would display notes and todos."
msgstr ""
"Affiche uniquement les notes du ou des types spécifiés. Le type peut-être "
"Affiche uniquement les notes du ou des types spécifiés. Le type peut-être "
"`n` pour les notes, `t` pour les tâches (par exemple, `-tt` affiche "
"uniquement les tâches, tandis que `-ttd` affiche les notes et les tâches)."
@ -189,7 +189,7 @@ msgstr ""
"les carnets), DATE, TACHE_TERMINE (pour les tâches), TITRE"
msgid "Please select a notebook first."
msgstr "Veuillez sélectionner un carnet d'abord."
msgstr "Veuillez d'abord sélectionner un carnet."
msgid "Creates a new notebook."
msgstr "Créer un carnet."
@ -235,7 +235,7 @@ msgstr "Assigner la valeur [value] à la propriété <name> de la <note> donnée
msgid "Displays summary about the notes and notebooks."
msgstr "Afficher un résumé des notes et carnets."
msgid "Synchronizes with remote storage."
msgid "Synchronises with remote storage."
msgstr "Synchroniser les notes et carnets."
msgid "Sync to provided target (defaults to sync.target config value)"
@ -244,16 +244,16 @@ msgstr ""
"`sync.target`)."
msgid "Synchronisation is already in progress."
msgstr "Synchronisation est déjà en cours."
msgstr "La synchronisation est déjà en cours."
#, fuzzy, javascript-format
msgid "Synchronization target: %s (%s)"
msgstr "Cible de la synchronisation : %s"
#, javascript-format
msgid "Synchronisation target: %s (%s)"
msgstr "Cible de la synchronisation : %s (%s)"
msgid "Cannot initialize synchronizer."
msgstr "Impossible d'initialiser le synchroniseur."
msgid "Cannot initialize synchroniser."
msgstr "Impossible d'initialiser la synchronisation."
msgid "Starting synchronization..."
msgid "Starting synchronisation..."
msgstr "Commencement de la synchronisation..."
msgid "Done."
@ -274,14 +274,19 @@ msgstr ""
#, javascript-format
msgid "Invalid command: \"%s\""
msgstr "Commande invalie : \"%s\""
msgstr "Commande invalide : \"%s\""
#, fuzzy
msgid ""
"<action> can either be \"toggle\" or \"clear\". Use \"toggle\" to toggle the "
"given todo between completed and uncompleted state (If the target is not a "
"single note it will be converted to a todo). Use \"clear\" to convert the "
"given todo between completed and uncompleted state (If the target is a "
"regular note it will be converted to a todo). Use \"clear\" to convert the "
"todo back to a regular note."
msgstr ""
"Gère le status des tâches. <action> peut être \"toggle\" ou \"clear\". "
"Utilisez \"toggle\" pour basculer la tâche entre le status terminé et non-"
"terminé (Si la cible est une note, elle sera convertie en tâche). Utilisez "
"\"clear\" pour convertir la tâche en note."
msgid ""
"Switches to [notebook] - all further operations will happen within this "
@ -308,8 +313,8 @@ msgstr "Le logiciel a été autorisé."
msgid "Please open this URL in your browser to authenticate the application:"
msgstr ""
"Veuillez ouvrir cette URL dans votre navigateur internet pour authentifier "
"le logiciel :"
"Veuillez ouvrir cette URL dans votre navigateur internet pour autoriser le "
"logiciel :"
msgid ""
"Please set the \"sync.2.path\" config value to the desired synchronisation "
@ -355,8 +360,8 @@ msgid "Completed: %s"
msgstr "Terminé : %s"
#, javascript-format
msgid "Synchronization is already in progress. State: %s"
msgstr "Synchronisation est déjà en cours. Etat : %s"
msgid "Synchronisation is already in progress. State: %s"
msgstr "La synchronisation est déjà en cours. Etat : %s"
msgid "Conflicts"
msgstr "Conflits"
@ -410,29 +415,28 @@ msgid "Non-completed and recently completed ones"
msgstr "Tâches non-complétées et récentes"
msgid "Non-completed ones only"
msgstr "Tâche complétée seulement"
msgstr "Tâches complétées seulement"
msgid "Show uncompleted todos on top of the lists"
msgstr ""
msgstr "Montrer les tâches non-terminées en haut des listes"
msgid "Save location with notes"
msgstr ""
msgstr "Enregistrer l'emplacement avec les notes"
#, fuzzy
msgid "Synchronisation interval"
msgstr "Cible de la synchronisation"
msgstr "Interval de synchronisation"
#, javascript-format
msgid "%d minutes"
msgstr ""
msgstr "%d minutes"
#, javascript-format
msgid "%d hour"
msgstr ""
msgstr "%d heure"
#, javascript-format
msgid "%d hours"
msgstr ""
msgstr "%d heures"
msgid "Sync status (synced items / total items)"
msgstr "Status de la synchronisation (objets synchro. / total)"
@ -483,13 +487,13 @@ msgstr "Etat"
msgid "Configuration"
msgstr "Configuration"
msgid "Synchronize"
msgid "Synchronise"
msgstr "Synchroniser"
msgid "Cancel synchronization"
msgid "Cancel synchronisation"
msgstr "Annuler synchronisation"
#, fuzzy, javascript-format
#, javascript-format
msgid "The notebook could not be saved: %s"
msgstr "Ce carnet n'a pas pu être sauvegardé : %s"
@ -502,9 +506,6 @@ msgstr "Sans titre"
msgid "Delete note?"
msgstr "Supprimer la note ?"
msgid "Attach file"
msgstr "Attacher un fichier"
msgid "Delete note"
msgstr "Supprimer la note"
@ -533,10 +534,10 @@ msgid "Delete notebook"
msgstr "Supprimer le carnet"
msgid "Login with OneDrive"
msgstr ""
msgstr "Se connecter avec OneDrive"
msgid "Search"
msgstr ""
msgstr "Chercher"
msgid ""
"Click on the (+) button to create a new note or notebook. Click on the side "
@ -551,7 +552,10 @@ msgstr ""
"(+)."
msgid "Welcome"
msgstr ""
msgstr "Bienvenu"
#~ msgid "Attach file"
#~ msgstr "Attacher un fichier"
#~ msgid "All potential ports are in use - please report the issue at %s"
#~ msgstr ""

21
CliClient/locales/joplin.pot
View File

@ -213,7 +213,7 @@ msgstr ""
msgid "Displays summary about the notes and notebooks."
msgstr ""
msgid "Synchronizes with remote storage."
msgid "Synchronises with remote storage."
msgstr ""
msgid "Sync to provided target (defaults to sync.target config value)"
@ -223,13 +223,13 @@ msgid "Synchronisation is already in progress."
msgstr ""
#, javascript-format
msgid "Synchronization target: %s (%s)"
msgid "Synchronisation target: %s (%s)"
msgstr ""
msgid "Cannot initialize synchronizer."
msgid "Cannot initialize synchroniser."
msgstr ""
msgid "Starting synchronization..."
msgid "Starting synchronisation..."
msgstr ""
msgid "Done."
@ -250,8 +250,8 @@ msgstr ""
msgid ""
"<action> can either be \"toggle\" or \"clear\". Use \"toggle\" to toggle the "
"given todo between completed and uncompleted state (If the target is not a "
"single note it will be converted to a todo). Use \"clear\" to convert the "
"given todo between completed and uncompleted state (If the target is a "
"regular note it will be converted to a todo). Use \"clear\" to convert the "
"todo back to a regular note."
msgstr ""
@ -322,7 +322,7 @@ msgid "Completed: %s"
msgstr ""
#, javascript-format
msgid "Synchronization is already in progress. State: %s"
msgid "Synchronisation is already in progress. State: %s"
msgstr ""
msgid "Conflicts"
@ -447,10 +447,10 @@ msgstr ""
msgid "Configuration"
msgstr ""
msgid "Synchronize"
msgid "Synchronise"
msgstr ""
msgid "Cancel synchronization"
msgid "Cancel synchronisation"
msgstr ""
#, javascript-format
@ -466,9 +466,6 @@ msgstr ""
msgid "Delete note?"
msgstr ""
msgid "Attach file"
msgstr ""
msgid "Delete note"
msgstr ""

2
ReactNativeClient/lib/components/screens/note.js
View File

@ -274,7 +274,7 @@ class NoteScreenComponent extends BaseScreenComponent {
const note = this.state.note;
return [
{ title: _('Attach file'), onPress: () => { this.attachFile_onPress(); } },
// { title: _('Attach file'), onPress: () => { this.attachFile_onPress(); } },
{ title: _('Delete note'), onPress: () => { this.deleteNote_onPress(); } },
{ title: note && !!note.is_todo ? _('Convert to regular note') : _('Convert to todo'), onPress: () => { this.toggleIsTodo_onPress(); } },
{ title: this.state.showNoteMetadata ? _('Hide metadata') : _('Show metadata'), onPress: () => { this.showMetadata_onPress(); } },

6
ReactNativeClient/lib/components/side-menu-content.js
View File

@ -16,6 +16,8 @@ let styles = {
menu: {
flex: 1,
backgroundColor: globalStyle.backgroundColor,
borderTopWidth: 1,
borderTopColor: globalStyle.dividerColor,
},
name: {
position: 'absolute',
@ -148,7 +150,7 @@ class SideMenuContentComponent extends Component {
}
synchronizeButton(state) {
const title = state == 'sync' ? _('Synchronize') : _('Cancel synchronization');
const title = state == 'sync' ? _('Synchronise') : _('Cancel synchronisation');
const iconComp = state == 'sync' ? <Icon name='md-sync' style={globalStyle.icon} /> : <Icon name='md-close' style={globalStyle.icon} />;
return (
@ -211,7 +213,7 @@ class SideMenuContentComponent extends Component {
return (
<View style={{flex:1, borderRightWidth: 1, borderRightColor: globalStyle.dividerColor }}>
<View style={{flexDirection:'row'}}>
<Image style={{flex:1, height: 150}} source={require('../images/SideMenuHeader.png')} />
<Image style={{flex:1, height: 100}} source={require('../images/SideMenuHeader.png')} />
</View>
<ScrollView scrollsToTop={false} style={styles.menu}>
{ items }

2
ReactNativeClient/lib/registry.js
View File

@ -122,7 +122,7 @@ reg.scheduleSync = async (delay = null) => {
const syncTargetId = Setting.value('sync.target');
if (!reg.syncHasAuth(syncTargetId)) {
reg.logger().info('Synchronizer is missing credentials - manual sync required to authenticate.');
reg.logger().info('Synchroniser is missing credentials - manual sync required to authenticate.');
return;
}

9
ReactNativeClient/lib/synchronizer.js
View File

@ -150,10 +150,9 @@ class Synchronizer {
if (!options) options = {};
if (this.state() != 'idle') {
let error = new Error(_('Synchronization is already in progress. State: %s', this.state()));
let error = new Error(_('Synchronisation is already in progress. State: %s', this.state()));
error.code = 'alreadyStarted';
throw error;
//this.logger().info('Synchronization is already in progress. State: ' + this.state());
return;
}
@ -180,7 +179,7 @@ class Synchronizer {
this.dispatch({ type: 'SYNC_STARTED' });
this.logSyncOperation('starting', null, null, 'Starting synchronization to target ' + syncTargetId + '... [' + synchronizationId + ']');
this.logSyncOperation('starting', null, null, 'Starting synchronisation to target ' + syncTargetId + '... [' + synchronizationId + ']');
try {
await this.api().mkdir(this.syncDirName_);
@ -460,7 +459,7 @@ class Synchronizer {
}
if (this.cancelling()) {
this.logger().info('Synchronization was cancelled.');
this.logger().info('Synchronisation was cancelled.');
this.cancelling_ = false;
}
@ -468,7 +467,7 @@ class Synchronizer {
this.progressReport_.completedTime = time.unixMs();
this.logSyncOperation('finished', null, null, 'Synchronization finished [' + synchronizationId + ']');
this.logSyncOperation('finished', null, null, 'Synchronisation finished [' + synchronizationId + ']');
await this.logSyncSummary(this.progressReport_);