Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Checked translation #581

Open
wants to merge 19 commits into
base: dev
Choose a base branch
from
Open

Checked translation #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f9366aa
Docker file updated #534
izabellamatos Jul 25, 2017
00cf184
Update AdminController.php
izabellamatos Jul 26, 2017
a832bf6
Remove NodeJS-Legacy (Fixes: #550) (#551)
justinwray Aug 28, 2017
49c7459
Downgraded DropkickJS and Streamlined Provision for NodeJS/Downloads …
justinwray Aug 31, 2017
d2ee4b3
Added Quick Setup Guide to README (#556)
justinwray Aug 31, 2017
1f236bb
Update CONTRIBUTING (#557)
justinwray Aug 31, 2017
f930556
Merge remote-tracking branch 'upstream/master'
izabellamatos Sep 25, 2017
d7d41fb
Atualização de traduções ausentes
izabellamatos Oct 1, 2017
07a0d17
Adicionado mais traduções
izabellamatos Oct 2, 2017
ac79a65
Update lang_en.php
izabellamatos Oct 3, 2017
0ee3aaf
Finalizado a verificação de traduções
izabellamatos Oct 3, 2017
3f9ce5d
Adicionado tradução para o ENABLE/DISABLE Logos
izabellamatos Oct 3, 2017
860d4a7
Adicionado tradução ao Game Controls
izabellamatos Oct 3, 2017
4f30c8b
Adicionado traduções para o Cronômetro
izabellamatos Oct 3, 2017
94a669e
Novas traduções
izabellamatos Oct 3, 2017
6ab28c0
Update lang_en.php
izabellamatos Oct 3, 2017
c3f72bd
Update lang_en.php
izabellamatos Oct 4, 2017
19a859c
Merge pull request #1 from izabellamatos/traducao
izabellamatos Oct 4, 2017
ae29bd9
Merge branch 'master' of https://github.com/izabellamatos/fbctf into dev
izabellamatos Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,25 @@ ARG CRT

WORKDIR $HOME
COPY . $HOME
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have an unresolved merge conflict here

RUN apt-get update \
&& apt-get install -y \
rsync \
curl \
ca-certificates \
build-essential \
libssl-dev \
libffi-dev \
python-dev \
&& chown www-data:www-data $HOME \
&& ./extra/provision.sh -m $MODE -c $TYPE -k $KEY -C $CRT -D $DOMAIN -e $EMAIL -s `pwd` --docker \
&& rm -f /var/run/hhvm/sock \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
CMD ["./extra/service_startup.sh"]
=======
RUN chown www-data:www-data $HOME

RUN ./extra/provision.sh -m $MODE -c $TYPE -k $KEY -C $CRT -D $DOMAIN -e $EMAIL -s `pwd` --docker
CMD ["./extra/service_startup.sh"]
CMD ["./extra/service_startup.sh"]
>>>>>>> master
4 changes: 2 additions & 2 deletions src/controllers/AdminController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ public function renderControlsContent(): :xhp {
return
<div>
<header class="admin-page-header">
<h3>Game Controls</h3>
<h3>{tr('Game Controls')}</h3>
<span class="admin-section--status">
{tr('status_')}<span class="highlighted">{tr('OK')}</span>
</span>
Expand Down Expand Up @@ -3696,7 +3696,7 @@ class="fb-cta cta--yellow js-confirm-save"
class={$highlighted_color}
href="#"
data-action={str_replace('_', '-', $highlighted_action)}>
{$action_text}
{tr($action_text)}
</a>
</header>
<div class="fb-column-container">
Expand Down
12 changes: 6 additions & 6 deletions src/inc/gameboard/modules/game-clock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class ClockModuleController {
return
<div>
<header class="module-header">
<h6>Game Clock</h6>
<h6>{tr('Game Clock')}</h6>
</header>
<div class="module-content module-scrollable">
<div class="game-clock fb-numbers">
Expand All @@ -111,8 +111,8 @@ class ClockModuleController {
</span>
</div>
<div class="game-progress fb-progress-bar">
<span class="label label--left">[Start]</span>
<span class="label label--right">[End]</span>
<span class="label label--left">[{tr('Start')}]</span>
<span class="label label--right">[{tr('End')}]</span>
{$indicator}
</div>
</div>
Expand All @@ -121,7 +121,7 @@ class ClockModuleController {
return
<div>
<header class="module-header">
<h6>Game Clock</h6>
<h6>{tr('Game Clock')}</h6>
</header>
<div class="module-content module-scrollable">
<div class="game-clock fb-numbers">
Expand All @@ -132,8 +132,8 @@ class ClockModuleController {
<span class="clock-milliseconds">{$milliseconds}</span>
</div>
<div class="game-progress fb-progress-bar">
<span class="label label--left">[Start]</span>
<span class="label label--right">[End]</span>
<span class="label label--left">[{tr('Start')}]</span>
<span class="label label--right">[{tr('End')}]</span>
{$indicator}
</div>
</div>
Expand Down
88 changes: 86 additions & 2 deletions src/language/lang_en.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
'Login',
'Soon' =>
'Soon',
'In Progress' =>
'In Progress',
'Upcoming Game' =>
'Upcoming Game',
'_days' =>
Expand Down Expand Up @@ -140,6 +142,8 @@
'View mode',
'Tutorial' =>
'Tutorial',
'Account' =>
'Account',
'Scoreboard' =>
'Scoreboard',
'You' =>
Expand Down Expand Up @@ -227,14 +231,22 @@
'Bases Cycle (s)',
'Default Bonus Dec' =>
'Default Bonus Dec',
'Autorun Cycle (s)' =>
'Autorun Cycle (s)',
'Auto Announcements' =>
'Auto Announcements',
'Game Schedule' =>
'Game Schedule',
'Game Start Year' =>
'Game Start Year',
'Game End Year' =>
'Game End Year',
'Month' =>
'Month',
'Day' =>
'Day',
'Hour' =>
'Hour',
'Minute' =>
'Minute',
'Timer' =>
Expand All @@ -247,6 +259,10 @@
'Begin Time',
'Expected End Time' =>
'Expected End Time',
'LiveSync' =>
'Livesync',
'Optional LiveSync Auth Key' =>
'Optional Livesync Auth Key',
'Internationalization' =>
'Internationalization',
'Language' =>
Expand All @@ -255,6 +271,10 @@
'Branding',
'Custom Logo' =>
'Custom Logo',
'Custom Organization' =>
'Custom Organization',
'Custom Byline' =>
'Custom Byline',
'Logo' =>
'Logo',
'Custom Text' =>
Expand All @@ -263,6 +283,8 @@
'DELETE',
'Delete' =>
'Delete',
'Announcement Controls' =>
'Announcement Controls',
'No Announcements' =>
'No Announcements',
'Game Controls' =>
Expand All @@ -273,8 +295,16 @@
'Create',
'General' =>
'General',
'Back Up Database' =>
'Back Up Database',
'Utilities' =>
'Utilities',
'Flush Memcached' =>
'Flush Memcached',
'Reset Database' =>
'Reset Database',
'Restore Database' =>
'Restore Database',
'Backup Database' =>
'Backup Database',
'Export Full Game' =>
'Export Full Game',
'Import Full Game' =>
Expand All @@ -291,6 +321,10 @@
'Import Levels',
'Export Levels' =>
'Export Levels',
'Import Attachments' =>
'Import Attachments',
'Export Attachments' =>
'Export Attachments',
'Import Categories' =>
'Import Categories',
'Export Categories' =>
Expand Down Expand Up @@ -329,6 +363,10 @@
'Enabled',
'Disabled' =>
'Disabled',
'ENABLE' =>
'ENABLE',
'DISABLE' =>
'DISABLE',
'Quiz Level' =>
'Quiz Level',
'Show Answer' =>
Expand Down Expand Up @@ -499,6 +537,8 @@
'End Game',
'Begin Game' =>
'Begin Game',
'Pause Game' =>
'Pause Game',
'Game Admin' =>
'Game Admin',
'Controls' =>
Expand Down Expand Up @@ -576,12 +616,30 @@
'end_',
'Are you sure you want to finish the current game?' =>
'Are you sure you want to finish the current game?',
'pause_' =>
'pause_',
'Are you sure you want to pause the current game?' =>
'Are you sure you want to pause the current game?',
'unpause_' =>
'unpause_',
'Are you sure you want to unpause the current game?' =>
'Are you sure you want to unpause the current game?',
'Are you sure you want to logout from the game?' =>
'Are you sure you want to logout from the game?',
'delete_' =>
'delete_',
'Are you sure you want to delete this level? All data for this level will be irreversibly removed, including scores.' =>
'Are you sure you want to delete this level? All data for this level will be irreversibly removed, including scores.',
'Are you sure you want to delete this team? All data for this team will be irreversibly removed, including scoring logs. If you prefer to retain data, you can disable the team instead.' =>
'Are you sure you want to delete this team? All data for this team will be irreversibly removed, including scoring logs. If you prefer to retain data, you can disable the team instead.',
'Saved' =>
'Saved',
'All changes have been successfully saved.' =>
'All changes have been successfully saved.',
'Imported' =>
'Imported',
'Items have been imported successfully' =>
'Items have been imported successfully',
'Error' =>
'Error',
'Sorry your form was not saved. Please correct the all errors and save again.' =>
Expand All @@ -590,6 +648,16 @@
'cancel_',
'Are you sure you want to cancel? You have unsaved changes that will be reverted.' =>
'Are you sure you want to cancel? You have unsaved changes that will be reverted.',
'Database' =>
'Database',
'restore_' =>
'restore_',
'Are you sure you want to restore the database? This will overwrite ALL existing data!' =>
'Are you sure you want to restore the database? This will overwrite ALL existing data!',
'reset_' =>
'reset_',
'Are you sure you want to reset the database? This will destroy ALL data! Admin accounts will remain.' =>
'Are you sure you want to reset the database? This will destroy ALL data! Admin accounts will remain.',
'choose_logo' =>
'choose_logo',
'captured_' =>
Expand Down Expand Up @@ -684,6 +752,22 @@
'Next',
'Skip to play' =>
'Skip to play',
'account_' =>
'account_',
'Settings' =>
'Settings',
'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.' =>
'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.',
'Set your live sync username' =>
'Set your live sync username',
'Set your live sync password' =>
'Set your live sync password',
'Link Your Google Account' =>
'Link Your Google Account',
'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.' =>
'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.',
'Close' =>
'Close',
'Powered By Facebook' =>
'Powered By Facebook',
'Active Directory / LDAP' =>
Expand Down