diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-21 09:49:53 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-21 09:49:53 -0500 |
| commit | 3ab222d1c748f26378152606a27accc8de9a45e0 (patch) | |
| tree | 3674775daf950a12a04bfbb494812b07316c5105 /phpBB/language/en/posting.php | |
| parent | fd4043526d9008de30ee82b4ea38efaef01796d0 (diff) | |
| parent | 721bc03b2b992f4df14afcbe64bb2f0cb7d73cf5 (diff) | |
| download | forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar.gz forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar.bz2 forums-3ab222d1c748f26378152606a27accc8de9a45e0.tar.xz forums-3ab222d1c748f26378152606a27accc8de9a45e0.zip | |
Merge remote-tracking branch 'remotes/Senky/ticket/11010' into develop
# By Senky (19) and others
# Via Senky
* remotes/Senky/ticket/11010: (32 commits)
[ticket/11010] properly tabifying 'max_autologin_time'
[ticket/11010] resolving latest comments
[ticket/11010] Fixes for number input in acp
[ticket/11010] Fix input type for urls
[ticket/11010] Fix email inputs
[ticket/11010] updating tests
[ticket/11010] dealing with dimensions problem, removing extra code
[ticket/11010] Change input type to search for search forms
[ticket/11010] Add all HTML5 input types to ACP
[ticket/11010] Add HTML5 input types to installer
[ticket/11010] validation to match type
[ticket/11010] displaying min and max only if they are set
[ticket/11010] fixing tests
[ticket/11010] replacing maxlenght with max
[ticket/11010] applying some of EXreaction notes
[ticket/11010] Try to keep min < max.
[ticket/11010] Mock user in order for the test to run standalone.
[ticket/11010] Progress toward fixing the test suite.
[ticket/11010] adding type="url" to 'site_home_url'
[ticket/11010] fixing inputs types in memberlist_search.html
...
Diffstat (limited to 'phpBB/language/en/posting.php')
| -rw-r--r-- | phpBB/language/en/posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index f5478dded5..7651ff2b63 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -161,7 +161,7 @@ $lang = array_merge($lang, array( 'PLACE_INLINE' => 'Place inline', 'POLL_DELETE' => 'Delete poll', 'POLL_FOR' => 'Run poll for', - 'POLL_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending poll.', + 'POLL_FOR_EXPLAIN' => 'Enter 0 for a never ending poll.', 'POLL_MAX_OPTIONS' => 'Options per user', 'POLL_MAX_OPTIONS_EXPLAIN' => 'This is the number of options each user may select when voting.', 'POLL_OPTIONS' => 'Poll options', @@ -211,7 +211,7 @@ $lang = array_merge($lang, array( 'SMILIES_ARE_ON' => 'Smilies are <em>ON</em>', 'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit', 'STICK_TOPIC_FOR' => 'Stick topic for', - 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.', + 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.', 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.', 'TOO_FEW_CHARS' => 'Your message contains too few characters.', |