Commit Graph

49 Commits

Author SHA1 Message Date
redmatrix cd2b811555 move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. 2015-09-26 23:44:30 -07:00
redmatrix 5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
friendica e006658b01 raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
zottel 2790d9f146 remove unused email template files 2014-10-10 11:42:46 +02:00
pixelroot cadcd45e89 Updated Russian translation 2014-06-30 14:18:02 +02:00
pixelroot 9c94504156 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-23 08:42:45 +02:00
friendica 3714bdfc54 Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master 2014-06-14 15:12:16 -07:00
pixelroot aea19a5b3a modified: view/ru/strings.php 2014-06-14 15:14:07 +02:00
pixelroot 7f4516d747 modified: .htaccess
modified:   view/ru/strings.php
2014-06-14 14:34:17 +02:00
pixelroot 6a307f0db1 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-14 10:20:57 +02:00
pixelroot 39418fc35b modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-14 09:25:01 +02:00
RedMatrix 0c51aae768 Merge pull request #486 from pixelroot/master
modified:   view/ru/messages.po
2014-06-13 09:30:35 +10:00
pixelroot 0d33b03633 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-12 16:30:58 +02:00
friendica 71ded9388b missing paren 2014-05-13 02:17:17 -07:00
friendica 8c948f4bbe forbid redefinition of language plural_select function 2014-05-13 02:10:06 -07:00
RedMatrix d1841911b3 Merge pull request #458 from pixelroot/master
modified:   view/ru/messages.po
2014-05-12 18:27:05 +10:00
pixelroot 5830e85912 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-05-12 09:57:48 +02:00
friendica ec6b8e5cda Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
Conflicts:
	view/ru/strings.php
2014-01-15 16:14:43 -08:00
pixelroot 4fdd9c39c5 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-01-13 18:29:37 +01:00
pixelroot ecb125a47d modified: view/ru/messages.po 2014-01-13 16:10:58 +01:00
friendica 3ff9642750 update ru strings 2013-09-22 21:18:15 -07:00
friendica 91aa5d73e7 Merge pull request #138 from pixelroot/master
modified:   view/ru/messages.po
2013-09-18 03:20:58 -07:00
pixelroot 88ea4f80bc modified: view/ru/messages.po 2013-09-16 08:46:15 +02:00
Olaf Conradi 1dd2a65210 Merge pull request #132 from pixelroot/master
modified:   view/ru/messages.po
2013-09-14 14:52:17 -07:00
pixelroot b824552e13 modified: view/ru/messages.po 2013-09-13 12:06:08 +02:00
friendica 6da4e41031 ru strings updated 2013-08-14 05:03:18 -07:00
friendica 499241c245 Merge pull request #95 from pixelroot/master
modified:   view/ru/messages.po
2013-08-14 05:06:20 -07:00
pixelroot b860188f71 modified: view/ru/messages.po 2013-08-12 15:46:01 +02:00
pixelroot f6ec3b5912 modified: view/ru/messages.po 2013-08-12 14:46:08 +02:00
friendica d8d45dab76 fix string horkage 2013-08-09 04:08:01 -07:00
friendica b1dc5b827b Merge pull request #92 from pixelroot/master
modified:   view/ru/messages.po
2013-08-09 03:57:57 -07:00
pixelroot ae82c09424 modified: view/ru/messages.po 2013-08-09 12:06:20 +02:00
friendica 085eec4869 malformed ru string file 2013-08-08 03:28:42 -07:00
friendica 6b7c720673 Merge pull request #91 from pixelroot/master
modified:   view/ru/messages.po
2013-08-08 03:16:26 -07:00
pixelroot 0335e0fffc modified: view/ru/messages.po 2013-08-08 11:54:03 +02:00
friendica 99bd0712b6 Add a site access policy (to determine if this is really a public site or just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree. 2013-08-06 17:15:41 -07:00
friendica 687ea0ca24 ru string update 2013-08-06 16:10:37 -07:00
friendica 026c93ddf2 Merge pull request #89 from pixelroot/master
modified:   view/ru/messages.po
2013-08-06 16:12:16 -07:00
pixelroot fa297b8d6e modified: view/ru/messages.po 2013-08-06 14:37:55 +02:00
pixelroot 9f649b4d95 modified: view/ru/messages.po 2013-08-06 13:53:09 +02:00
friendica 99252d65bf reset email templates to English 2013-06-16 16:49:46 -07:00
friendica 488714290f global rename viewcontacts to viewconnections 2013-02-19 03:00:29 -08:00
friendica 846a9813b2 here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers. 2012-10-01 18:02:11 -07:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
Friendika c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Friendika 18315a1377 Russian translation (80% complete) 2011-09-06 01:52:45 -07:00