Commit Graph

7134 Commits

Author SHA1 Message Date
Your Name
f928f17bb5 日本語追加 2018-10-29 10:39:11 +09:00
Mario Vavti
dcdd97a985 fix ellipsis for too long nav banner
(cherry picked from commit a61ce45a32)
2018-10-21 09:10:45 +02:00
Mario Vavti
fa9e9510e5 Merge branch '3.8RC' 2018-10-19 11:18:28 +02:00
Mario
d775a7ee21 Merge branch 'patch-18' into 'dev'
Russian translation for upgrade plugin added

See merge request hubzilla/core!1344

(cherry picked from commit c044ff3444)

ac2b6bcc Russian translation for upgrade plugin added
6e758423 Update hstrings.php
2018-10-19 10:56:55 +02:00
Mario
ba9b49bc83 Merge branch 'patch-17' into 'dev'
Add Russian translations to Newmember widget

See merge request hubzilla/core!1339

(cherry picked from commit ed08eb07c6)

04edb741 Add Russian translations to Newmember widget
d2d6f8c9 Update hstrings.php
2018-10-16 14:08:02 +02:00
Mario
eb133ef9a7 Merge branch 'patch-16' into 'dev'
JS plurals displaying code cleanup

See merge request hubzilla/core!1338

(cherry picked from commit 721461dd3e)

b7280a44 JS plurals displaying code cleanup
ab0e2f52 Update language.php
f9c3b807 Update main.js
ce52c27a Update main.js
2018-10-15 09:59:25 +02:00
Mario
337e25ad43 Merge branch 'patch-15' into 'dev'
Add JS function code for plurals translation in Russian

See merge request hubzilla/core!1337

(cherry picked from commit 7042528d26)

ee4a2629 Add JS function code for plurals translation
8af91b02 Update hstrings.php
2018-10-15 09:58:24 +02:00
Mario
eaee27c9e4 Merge branch 'patch-14' into 'dev'
Add date/time plurals translation in JavaScript

See merge request hubzilla/core!1336

(cherry picked from commit a2575059e2)

5c0d3187 Add date/time plurals translation in JavaScript
729d0d53 Update language.php
f68674b3 Update js_strings.tpl
3ac4337a Update main.js
e96e3dc6 Update po2php.php
54bdf59d Update js_strings.php
2018-10-13 20:17:14 +02:00
Mario Vavti
2c961328f1 Merge branch 'dev' into 3.8RC 2018-10-13 17:21:12 +02:00
Mario Vavti
c36773674e Revert "Merge branch 'patch-11' into 'dev'"
This reverts commit e518445853, reversing
changes made to 8ce240b95c.
2018-10-13 17:18:42 +02:00
Max Kostikov
54c615dbc2 Update hmessages.po
(cherry picked from commit 451ee5a593)
2018-10-13 14:55:25 +02:00
Max Kostikov
483ef09890 Update hstrings.php
(cherry picked from commit ba3811a284)
2018-10-13 14:54:57 +02:00
Max Kostikov
81a741e760 Update hstrings.php
(cherry picked from commit e2241b9365)
2018-10-13 14:54:29 +02:00
Max Kostikov
278f2a6cac New russian plurals for JavaScript
(cherry picked from commit fe2bb84403)
2018-10-13 14:54:05 +02:00
Max Kostikov
451ee5a593 Update hmessages.po 2018-10-13 14:22:58 +02:00
Max Kostikov
ba3811a284 Update hstrings.php 2018-10-13 14:22:13 +02:00
Max Kostikov
e2241b9365 Update hstrings.php 2018-10-13 14:20:48 +02:00
Max Kostikov
fe2bb84403 New russian plurals for JavaScript 2018-10-13 14:20:10 +02:00
Mario Vavti
f0cdbd0f52 Merge branch 'dev' into 3.8RC 2018-10-13 14:11:08 +02:00
Mario
e518445853 Merge branch 'patch-11' into 'dev'
Add date/time plurals translation in JavaScript

See merge request hubzilla/core!1331
2018-10-13 14:00:12 +02:00
Max Kostikov
3dfe604ba0 Update main.js 2018-10-13 00:15:48 +02:00
Max Kostikov
de59300aaf Update js_strings.tpl 2018-10-12 23:51:01 +02:00
Max Kostikov
b65ee01aef Update hmessages.po 2018-10-12 16:39:03 +02:00
Max Kostikov
2b311bd860 Update hstrings.php 2018-10-12 16:38:58 +02:00
Max Kostikov
a841b75b98 Update hstrings.php 2018-10-12 11:50:21 +02:00
Max Kostikov
9b3b7dc098 Update hmessages.po 2018-10-12 11:49:48 +02:00
Max Kostikov
3c5cfd465b Update hstrings.php 2018-10-11 23:39:58 +02:00
Max Kostikov
f61f9bdc5f Missed strings added to Russian translation 2018-10-11 23:39:13 +02:00
Manuel Jiménez Friaza
2ab6e0843d Typos in Spanish translation
(cherry picked from commit c54ba1fb86)
2018-10-11 16:06:45 +02:00
Manuel Jiménez Friaza
c54ba1fb86 Typos in Spanish translation 2018-10-11 12:23:00 +02:00
Max Kostikov
73e30e8085 Update hstrings.php 2018-10-10 17:45:03 +02:00
Max Kostikov
a53912cc19 Formatting fix in russian translation 2018-10-10 17:43:41 +02:00
Mario Vavti
ca5a1d0853 fix minor issue in dark and light schemas
(cherry picked from commit 97fcc495f2)
2018-10-10 14:03:12 +02:00
Mario Vavti
97fcc495f2 fix minor issue in dark and light schemas 2018-10-10 14:01:03 +02:00
Mario Vavti
94905a71ac fix even more wiki issues
(cherry picked from commit c06b37b798)
2018-10-10 11:07:00 +02:00
Mario Vavti
c7644ad29d fix some more wiki issues
(cherry picked from commit d29caa099a)
2018-10-10 11:06:39 +02:00
M.Dent
0daa462207 Fix escaping quote for wiki_delete_page
(cherry picked from commit 1ccca9863c)
2018-10-10 11:06:07 +02:00
M.Dent
d8f79f48e9 Rework Wiki encoding scheme.
(cherry picked from commit 709665846e)
2018-10-10 11:05:34 +02:00
Mario Vavti
c06b37b798 fix even more wiki issues 2018-10-10 11:01:13 +02:00
Mario Vavti
30e3580856 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-10-10 10:39:42 +02:00
Mario Vavti
d29caa099a fix some more wiki issues 2018-10-10 10:39:28 +02:00
Manuel Jiménez Friaza
d1270aab4d Fixed some errors in Spanish translation
(cherry picked from commit a7b03c1cea)
2018-10-10 09:23:32 +02:00
Mario
cd55298616 Merge branch 'dev' into 'dev'
Fixed some errors in Spanish translation

See merge request hubzilla/core!1323
2018-10-10 09:22:32 +02:00
M. Dent
350db4ed9f Merge branch 'fix-wiki-escaping' into 'dev'
Fix escaping quote for wiki_delete_page

See merge request hubzilla/core!1324
2018-10-10 03:04:31 +02:00
M.Dent
1ccca9863c Fix escaping quote for wiki_delete_page 2018-10-09 21:01:05 -04:00
Manuel Jiménez Friaza
a7b03c1cea Fixed some errors in Spanish translation 2018-10-09 11:48:08 +02:00
Mario
37b94bf5fa Merge branch 'fix-wiki-escaping' into 'dev'
Fix wiki escaping (Regression tests needed)

See merge request hubzilla/core!1321
2018-10-08 21:20:17 +02:00
Manuel Jiménez Friaza
cbbe4b33a3 Update Spanish translation
(cherry picked from commit e877a001ab)
2018-10-08 21:10:04 +02:00
Manuel Jiménez Friaza
e877a001ab Update Spanish translation 2018-10-08 19:57:11 +02:00
M.Dent
709665846e Rework Wiki encoding scheme. 2018-10-08 13:35:18 -04:00