Tom
506f7502ea
update Chinese Language File
2015-07-25 15:29:07 +10:00
Asselin de Beauville
26882346c4
Update lang.php
...
Updated 'settings_menu' var.
2015-07-25 07:28:43 +02:00
Samuel Georges
d931c6ecfc
Merge pull request #1296 from mrmlnc/path-1
...
Update Ru_lang to current status develop branch
2015-07-25 15:19:13 +10:00
Samuel Georges
bdc05a20fe
Merge pull request #1291 from DZB-Team/develop
...
Some new language strings...
2015-07-25 15:18:17 +10:00
Samuel Georges
d6d48b4580
Merge pull request #1285 from bilgorajskim/bilgorajskim-patch-1
...
Update Polish translation
2015-07-25 15:04:52 +10:00
Samuel Georges
561adcfb37
Merge pull request #1279 from tsioukas/patch-1
...
Added new phrases on Greek Language
2015-07-25 15:01:01 +10:00
Samuel Georges
a5531f931b
Manual merge - fixes #1278 Thanks @Freakspot
2015-07-25 15:00:19 +10:00
Denis Malinochkin
5f1e03fc46
Update Ru_lang to current branch
2015-07-18 15:53:02 +03:00
raw99
b2d7cea159
Removing dublicate string
2015-07-14 19:36:55 +03:00
Samuel Georges
41a94a50ae
Fixes broken critical bum bum
2015-07-14 20:47:00 +10:00
bilgorajskim
3ed3716548
Update polish translation
2015-07-13 09:54:58 +02:00
bilgorajskim
0c7c6f4895
Update polish translation
2015-07-13 08:59:28 +02:00
Antony Tsioukas
b3bf7645a0
Added new phrases on Greek lang.php
2015-07-11 19:08:01 +03:00
Samuel Georges
961509839e
Manually merge Pull Requests that are prepared incorrectly
...
Fixes #1229
Fixes #1259
Fixes #1260
Fixes #1261
Fixes #1262
Fixes #1263
Fixes #1264
Fixes #1277
Thanks @felixinx @awaysoft @tsioukas @Freakspot
2015-07-11 14:36:38 +10:00
Samuel Georges
60fac726a9
Merge pull request #1274 from powelski/develop
...
Translate Media to Polish language
2015-07-11 11:48:05 +10:00
Samuel Georges
a3223e8d03
Merge pull request #1256 from sajjad-ser/master
...
update persian language
2015-07-11 11:26:41 +10:00
Kris Powelski
502a13f08d
Translate Media to Polish language
2015-07-09 18:48:10 +02:00
Sajjad
711df56986
update persian language
2015-07-05 21:26:39 +04:30
Samuel Georges
4f0fa37d6f
Update of FRENCH Translation for OctoberCMS - thanks @Galixte
...
Fixes #1248 without 11 commits
2015-07-04 10:36:32 +10:00
Samuel Georges
b9e4eeb60c
Merge pull request #1252 from DZB-Team/develop
...
Some small Latvian language fixes...
2015-07-04 10:26:15 +10:00
Samuel Georges
adfc198428
Merge pull request #1239 from gergo85/master
...
Updated Hungarian language
2015-07-04 10:25:11 +10:00
raw99
9e59382822
Some small fix again...
2015-07-01 23:24:39 +03:00
raw99
8a36ad5403
Some Latvian language fixes...
2015-07-01 23:13:30 +03:00
Szabó Gergő
0ed57bb692
Updated Hungarian language
2015-06-27 11:58:30 +02:00
Samuel Georges
57f32d0055
Adds basic permissions for media manager - Fixes #1134
...
Note if media management is restricted, it can still be accessed via the Rich Editor - we need to address this concern later. This change is to allow the menu item to be toggled on/off.
2015-06-27 11:50:46 +10:00
Samuel Georges
06ec662131
Update Chinese (China) language - Fixes #1237 without 10 commits
2015-06-27 09:46:05 +10:00
Samuel Georges
e6f70eafdd
Translate prompt for FileUpload + MediaFinder
...
Remove redundant language key
Recompile assets
2015-06-20 22:21:18 +10:00
Denis Malinochkin
59c0e84701
Synchronization Ru_lang with current develop branch
...
Full synchronization translate with current develop branch.
- Translate new keys
- Update the changed keys
- Synchronizing quotes and commas with develop branch
2015-06-04 19:14:32 +03:00
Samuel Georges
069ec925b2
Merge branch 'master' into develop
2015-05-30 12:50:31 +10:00
Samuel Georges
3ba1cee05a
Merge pull request #1161 from DZB-Team/master
...
Tanslation files for Latvian language
2015-05-30 10:45:00 +10:00
Samuel Georges
09501409c6
Fixes #1172 without using 7 commits
2015-05-30 10:00:55 +10:00
Samuel Georges
7e558ea706
Merge pull request #1171 from mrmlnc/develop
...
Update RU_lang
2015-05-30 09:58:28 +10:00
Denis Malinochkin
ab382e3771
Fix typos
2015-05-27 23:19:33 +03:00
Denis Malinochkin
8cdf2e1250
Update RU_lang
2015-05-27 23:16:06 +03:00
krisawzm
3d464a422a
Improved language nb-no in cms module
2015-05-25 23:16:53 +02:00
krisawzm
d11680eba0
Updated language nb-no in cms module
2015-05-25 23:16:21 +02:00
raw99
5a6aaf760c
adding translations for latvian language
2015-05-23 23:59:46 +03:00
gergo85
7ab72b3743
Improve multilanguage support
2015-05-16 11:47:24 +02:00
Samuel Georges
7255615bef
Merge pull request #1120 from gergo85/master
...
Updated Hungarian language
2015-05-09 19:02:23 +10:00
gergo85
53babb83b6
Updated Hungarian language
2015-05-09 10:54:11 +02:00
Samuel Georges
189d56a6c5
Merge pull request #1106 from gergo85/master
...
Improve multilanguage support
2015-05-09 11:06:59 +10:00
gergo85
cb670237f2
Improve multilanguage support
2015-05-04 13:29:48 +02:00
Gerard Arall
a1790b0dbf
Translations
2015-05-02 19:32:22 +02:00
krisawzm
23afa8bc1c
Updates lang nb-no
2015-04-26 21:38:02 +02:00
alekseybobkov
06e5dce96a
Fixed a conflict in framework.js. Closures in the script are named now, for the memory profiling needs.
...
Conflicts:
modules/system/assets/js/framework.js
2015-04-11 18:58:24 -07:00
alekseybobkov
c1740c479c
Media Manager: implemented insert link, insert image, and crop and insert features. Minor fixes in October core and third-party JS plugins.
2015-04-11 18:55:02 -07:00
Samuel Georges
5da198ccd8
Merge remote-tracking branch 'remotes/tresbach/develop' into develop
...
Conflicts:
modules/system/lang/pt-br/lang.php
modules/system/lang/pt-br/validation.php
2015-04-11 10:53:37 +10:00
Samuel Georges
d283d6b143
Merge remote-tracking branch 'remotes/krisawzm/develop' into develop
...
Conflicts:
modules/backend/models/BackendPreferences.php
modules/system/lang/ru/lang.php
modules/system/lang/sv/lang.php
2015-04-11 10:48:59 +10:00
alekseybobkov
790b464679
Merge branch 'develop' into media-manager
2015-04-04 19:01:08 -07:00
alekseybobkov
332d92f538
Implemented image inserting to Redactor.
2015-04-04 18:59:36 -07:00
