Commit 105aa7594db658635444cb37cc121c3952b8216b
Update codebase
Marcos Gutierrez committed on 9/29/2017, 12:59:36 PMParent: b3f266f00eac02d07994bab481cbe258401541f8
Files changed
| locales/ki.json | changed |
| modules/page/html/render/message.js | changed |
| locales/ki.json | ||
|---|---|---|
| @@ -31,6 +31,7 @@ | ||
| 31 | 31 | "likes": "پسند کرتا ہے", |
| 32 | 32 | "Write a private reply": "نجی جواب", |
| 33 | 33 | "Write a public reply": "پبلک جواب", |
| 34 | 34 | "Publishing...": "پبلشنگ ...", |
| 35 | - "Publish": "شائع" | |
| 36 | -} | |
| 35 | + "Publish": "شائع", | |
| 36 | + "More Channels...": "More Channels..." | |
| 37 | +} | |
| modules/page/html/render/message.js | ||
|---|---|---|
| @@ -39,17 +39,13 @@ | ||
| 39 | 39 | placeholder: when(meta.recps, i18n.__('Write a private reply'), i18n.__('Write a public reply')) |
| 40 | 40 | }) |
| 41 | 41 | |
| 42 | 42 | api.sbot.async.get(id, (err, value) => { |
| 43 | -<<<<<<< 7cd7a533a0573f32dd6e18be5e921a99e2c161af | |
| 44 | 43 | if (err) { |
| 45 | 44 | return result.set(h('PageHeading', [ |
| 46 | - h('h1', 'Cannot load thread. Root message missing.') | |
| 45 | + h('h1', i18n.__('Cannot load thead')) | |
| 47 | 46 | ])) |
| 48 | 47 | } |
| 49 | -======= | |
| 50 | - if (err) return result.set(h('div', {className: 'Error'}, [i18n.__('Cannot load thead')])) | |
| 51 | ->>>>>>> more translations | |
| 52 | 48 | |
| 53 | 49 | if (typeof value.content === 'string') { |
| 54 | 50 | value = api.message.sync.unbox(value) |
| 55 | 51 | } |
Built with git-ssb-web