Modifications @ Framasoft Weblate

1 / 4

/ 4

deevad Échec de la fusion de dépôt Pepper & Carrot Website	Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po Automatic merge failed; fix conflicts and then commit the result. (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/1) .merge_file_8ZZkRN:1078: duplicate message definition... .merge_file_8ZZkRN:380: ...this is the location of the first definition msggrep: found 1 fatal error ### /var/www/weblate/weblate-env/lib/python3.9/site-packages/weblate/examples/git-merge-gettext-po: error near line 170: status 1 error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1) Il y a un an
deevad Échec de la fusion de dépôt Pepper & Carrot Website	Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po Automatic merge failed; fix conflicts and then commit the result. (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/1) .merge_file_UdNC7v:1078: duplicate message definition... .merge_file_UdNC7v:380: ...this is the location of the first definition msggrep: found 1 fatal error ### /var/www/weblate/weblate-env/lib/python3.9/site-packages/weblate/examples/git-merge-gettext-po: error near line 170: status 1 error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/1) error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/1) error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1) Il y a un an
deevad Traduction ajoutée Pepper & Carrot Website Français	Anglais In French Français 11 caractères modifiés Traduction actuelle Traduit en Français Il y a un an
deevad Traduction ajoutée Pepper & Carrot Website Français	Anglais Temporary Drafts Français 22 caractères modifiés Traduction actuelle Traduit Brouillons temporaires Il y a un an
deevad Traduction ajoutée Pepper & Carrot Website Français	Anglais Community improvisations Français 32 caractères modifiés Traduction actuelle Traduit Improvisations de la communeauté Il y a un an
deevad Traduction modifiée Pepper & Carrot Website Français	Anglais Scenarios for new episodes Français 20 caractères modifiés Traduction actuelle Traduit ~~Couverture de l'~~Scénario pour nouveaux épisodes Il y a un an
deevad Traduction ajoutée Pepper & Carrot Website Français	Anglais Novels Français 9 caractères modifiés Traduction actuelle Traduit Nouvelles Il y a un an
deevad Traduction ajoutée Pepper & Carrot Website Français	Anglais Read from the beginning Français 20 caractères modifiés Traduction actuelle Traduit Lire depuis le début Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/6) Rebasing (2/6) error: could not apply 06bb7d7... Translated using Weblate (Slovenian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 06bb7d7... Translated using Weblate (Slovenian) Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/6) Rebasing (2/6) error: could not apply 06bb7d7... Translated using Weblate (Slovenian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 06bb7d7... Translated using Weblate (Slovenian) Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/6) Rebasing (2/6) error: could not apply 06bb7d7... Translated using Weblate (Slovenian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 06bb7d7... Translated using Weblate (Slovenian) Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po (1) Il y a un an
deevad Échec de la fusion de dépôt Pepper & Carrot Website	Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po Automatic merge failed; fix conflicts and then commit the result. (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/6) Rebasing (2/6) error: could not apply 06bb7d7... Translated using Weblate (Slovenian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 06bb7d7... Translated using Weblate (Slovenian) Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po (1) Il y a un an
deevad Échec de la fusion de dépôt Pepper & Carrot Website	Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po Automatic merge failed; fix conflicts and then commit the result. (1) Il y a un an
deevad Échec du rebasement du dépôt Pepper & Carrot Website	Rebasing (1/6) Rebasing (2/6) error: could not apply 06bb7d7... Translated using Weblate (Slovenian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 06bb7d7... Translated using Weblate (Slovenian) Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po (1) Il y a un an
deevad Échec de la fusion de dépôt Pepper & Carrot Website	Auto-merging po/sl.po CONFLICT (content): Merge conflict in po/sl.po Automatic merge failed; fix conflicts and then commit the result. (1) Il y a un an

1 / 4

/ 4

Rechercher

Action

Nom d’utilisateur de l’auteur

Modifier la période

Shortcut	Action
`?`	Open available keyboard shortcuts.
`Alt` + `Home`	Navigate to the first translation in the current search.
`Alt` + `End`	Navigate to the last translation in the current search.
`Alt` + `PageUp` or `Ctrl` + `↑` or `Alt` + `↑` or `Cmd` + `↑` or	Navigate to the last translation in the current search.
`Alt` + `PageDown` or `Ctrl` + `↓` or `Alt` + `↓` or `Cmd` + `↓` or	Navigate to the next translation in the current search.
`Ctrl` + `Enter` or `Cmd` + `Enter`	Submit current form; this works the same as pressing Save and continue while editing translation.
`Ctrl` + `Shift` + `Enter` or `Cmd` + `Shift` +`Enter`	Unmark translation as Needing edit and submit it.
`Alt` + `Enter` or `Option` + `Enter`	Submit the string as a suggestion; this works the same as pressing Suggest while editing translation.
`Ctrl` + `E` or `Cmd` + `E`	Focus on translation editor.
`Ctrl` + `U` or `Cmd` + `U`	Focus on comment editor.
`Ctrl` + `M` or `Cmd` + `M`	Shows Automatic suggestions tab.
`Ctrl` + `1` to `Ctrl` + `9` or `Cmd` + `1` to `Cmd` + `9`	Copies placeable of a given number from source string.
`Ctrl` + `M` followed by `1` to `9` or `Cmd` + `M` followed by `1` to `9`	Copy the machine translation of a given number to current translation.
`Ctrl` + `I` followed by `1` to `9` or `Cmd` + `I` followed by `1` to `9`	Ignorer un élément de la liste des contrôles de qualité défaillants.
`Ctrl` + `J` or `Cmd` + `J`	Shows the Nearby strings tab.
`Ctrl` + `S` or `Cmd` + `S`	Focus on search field.
`Ctrl` + `O` or `Cmd` + `O`	Copy the source string.
`Ctrl` + `Y` or `Cmd` + `Y`	Toggle the Needs editing checkbox.
`→`	Browse the next translation string.
`←`	Browse the previous translation string.