2heoh (2heoh) wrote in changelog,
2heoh
2heoh
changelog

[ljcom] r10712: Merge from /branches/mobile\n[tags: merg...

Committer: slobin
Merge from /branches/mobile\n[tags: merge]
_U  trunk/
U   trunk/bin/upgrading/en_LJ.dat
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/oauth:8215-9310
   + /branches/mobile:10279-10711
/branches/oauth:8215-9310

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-06-29 07:36:33 UTC (rev 10711)
+++ trunk/bin/upgrading/en_LJ.dat	2011-06-29 07:56:41 UTC (rev 10712)
@@ -10200,3 +10200,9 @@
 wallet.bml.admin.stat.th.tokens=tokens
 
 wallet.suggest_buy_tokens=Your [[feature_name]] balance is insufficient. <a href="[[landing]]">Buy LJ tokens</a> to use this method.
+
+mobile.operators.office=Office
+mobile.operators.beeline=Beeline
+mobile.ljtimes.minute=[[minute]] [[?minute|minute|minutes]]
+mobile.ljtimes.hour=[[hour]] [[?hour|hour|hours]]
+mobile.video.cut=You can watch this video on <b>www.livejournal.com</b>

Tags: 2heoh, dat, ljcom, merge
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments