[ljcom] r12981: LJSUP-14177 ([Friends Feed] Ability to s...

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/bin/upgrading/proplists-local.dat

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-12-03 13:57:10 UTC (rev 12980)
+++ trunk/bin/upgrading/en_LJ.dat	2012-12-03 14:16:35 UTC (rev 12981)
@@ -3880,6 +3880,22 @@
 
 friendsfeed.pagination.prev=Prev
 
+friendsfeed.settings.font_size.large=Large
+
+friendsfeed.settings.font_size.medium=Standard
+
+friendsfeed.settings.font_size.title=Font size:
+
+friendsfeed.settings.font_size.small=Small
+
+friendsfeed.settings.paging_type.endless=Endless
+
+friendsfeed.settings.paging_type.pages=Pages
+
+friendsfeed.settings.paging_type.title=Paging type:
+
+friendsfeed.settings.title=4. Feed settings
+
 friendsfeed.status.friends=Friends-only
 
 friendsfeed.status.friendgroups=Filtered to a group of friends

Modified: trunk/bin/upgrading/proplists-local.dat
===================================================================
--- trunk/bin/upgrading/proplists-local.dat	2012-12-03 13:57:10 UTC (rev 12980)
+++ trunk/bin/upgrading/proplists-local.dat	2012-12-03 14:16:35 UTC (rev 12981)
@@ -254,6 +254,14 @@
   multihomed: 
   prettyname: Friends Feed beta trigger
 
+userproplist.friendsfeed_font_size:
+  cldversion: 8
+  datatype: char
+  des: Friends Feed font size: 'small', 'medium' or 'large'
+  indexed: 
+  multihomed: 
+  prettyname: Friends Feed font size
+
 userproplist.friendsfeed_paging_type:
   cldversion: 8
   datatype: char