diff options
| author | Michael Ball <cycomachead@gmail.com> | 2014-02-04 11:59:45 -0800 |
|---|---|---|
| committer | Michael Ball <cycomachead@gmail.com> | 2014-02-04 11:59:45 -0800 |
| commit | 817f4c5420e5d55409c88386c478f14e4735a627 (patch) | |
| tree | 29af845c58934508a0ea842786c5838e8deb4519 /lang-fr.js | |
| parent | 9aa3921dd04ee8b6fedec0116f9e3f5503e4043b (diff) | |
| parent | 8b5fa2ff9bd81ad9227b2593f9ccd6fdb8d32444 (diff) | |
| download | snap-817f4c5420e5d55409c88386c478f14e4735a627.tar.gz snap-817f4c5420e5d55409c88386c478f14e4735a627.zip | |
resolve merge conflicts; date problems only
Diffstat (limited to 'lang-fr.js')
| -rw-r--r-- | lang-fr.js | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -185,7 +185,7 @@ SnapTranslator.dict.fr = { 'translator_e-mail': 'i.scool@mac.com', // optional 'last_changed': - '2013-12-04', // this, too, will appear in the Translators tab + '2014-02-04', // this, too, will appear in the Translators tab // GUI // control bar: @@ -469,7 +469,9 @@ SnapTranslator.dict.fr = { 'moi-m\u00EAme', 'delete this clone': 'supprime ce clone', - + 'pause all': + 'mettre en pause', + // sensing: 'touching %col ?': ' %col touch\u00E9?', |