Merge branch 'master' of https://github.com/friendica/red
This commit is contained in:
marijus
commit
b05eca295b
@ -984,7 +984,7 @@ msgstr "Start:"
|
||||
|
||||
#: ../../include/bb2diaspora.php:455 ../../include/event.php:30
|
||||
msgid "Finishes:"
|
||||
msgstr "Eindigt:"
|
||||
msgstr "Einde:"
|
||||
|
||||
#: ../../include/bb2diaspora.php:463 ../../include/event.php:40
|
||||
#: ../../include/identity.php:726 ../../mod/directory.php:156
|
||||
@ -6444,7 +6444,7 @@ msgstr "Volgorde is %s %s. Begintijd en titel zijn vereist."
|
||||
|
||||
#: ../../mod/events.php:473
|
||||
msgid "Event Starts:"
|
||||
msgstr "Gebeurtenis begint:"
|
||||
msgstr "Begin gebeurtenis:"
|
||||
|
||||
#: ../../mod/events.php:473 ../../mod/events.php:487 ../../mod/appman.php:91
|
||||
#: ../../mod/appman.php:92
|
||||
@ -6457,7 +6457,7 @@ msgstr "Einddatum/-tijd is niet bekend of niet relevant"
|
||||
|
||||
#: ../../mod/events.php:478
|
||||
msgid "Event Finishes:"
|
||||
msgstr "Gebeurtenis eindigt:"
|
||||
msgstr "Einde gebeurtenis:"
|
||||
|
||||
#: ../../mod/events.php:481
|
||||
msgid "Adjust for viewer timezone"
|
||||
|
||||
@ -216,7 +216,7 @@ $a->strings["Connection: %s"] = "Connectie: %s";
|
||||
$a->strings["Connection not found."] = "Connectie niet gevonden.";
|
||||
$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
|
||||
$a->strings["Starts:"] = "Start:";
|
||||
$a->strings["Finishes:"] = "Eindigt:";
|
||||
$a->strings["Finishes:"] = "Einde:";
|
||||
$a->strings["Location:"] = "Plaats:";
|
||||
$a->strings["Logout"] = "Uitloggen:";
|
||||
$a->strings["End this session"] = "Beëindig deze sessie";
|
||||
@ -1519,10 +1519,10 @@ $a->strings["Previous"] = "Vorige";
|
||||
$a->strings["hour:minute"] = "uur:minuut";
|
||||
$a->strings["Event details"] = "Details van gebeurtenis";
|
||||
$a->strings["Format is %s %s. Starting date and Title are required."] = "Volgorde is %s %s. Begintijd en titel zijn vereist.";
|
||||
$a->strings["Event Starts:"] = "Gebeurtenis begint:";
|
||||
$a->strings["Event Starts:"] = "Begin gebeurtenis:";
|
||||
$a->strings["Required"] = "Vereist";
|
||||
$a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd is niet bekend of niet relevant";
|
||||
$a->strings["Event Finishes:"] = "Gebeurtenis eindigt:";
|
||||
$a->strings["Event Finishes:"] = "Einde gebeurtenis:";
|
||||
$a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
|
||||
$a->strings["Description:"] = "Omschrijving:";
|
||||
$a->strings["Title:"] = "Titel:";
|
||||
|
||||
@ -556,9 +556,11 @@ aside li {
|
||||
.pager_last,
|
||||
.pager_prev,
|
||||
.pager_next,
|
||||
.pager-prev,
|
||||
.pager-next,
|
||||
.pager_n {
|
||||
border: 1px solid black;
|
||||
background: #EEE;
|
||||
border: 1px solid $editbuttons_bordercolour;
|
||||
background: $editbuttons_bgcolour;
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
@ -567,12 +569,11 @@ aside li {
|
||||
.pager_prev a,
|
||||
.pager_next a,
|
||||
.pager_n a {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.pager_current {
|
||||
border: 1px solid black;
|
||||
background: #FFCCCC;
|
||||
border: 1px solid transparent;
|
||||
background: transparent;
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
@ -990,6 +991,15 @@ aside li {
|
||||
color: #FF0000;
|
||||
}
|
||||
|
||||
.fc-state-highlight {
|
||||
background: none repeat scroll 0% 0% $cal_bgcolour !important;
|
||||
}
|
||||
|
||||
#fancybox-content {
|
||||
border: 0px solid $fancybox_bgcolour;
|
||||
background-color: $fancybox_bgcolour;
|
||||
}
|
||||
|
||||
.settings-block {
|
||||
border: 1px solid #AAA;
|
||||
margin: 10px;
|
||||
@ -2295,6 +2305,12 @@ blockquote {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.well {
|
||||
background-color: $advperm_bgcolour;
|
||||
border: 1px solid $advperm_bordercol;
|
||||
background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
|
||||
}
|
||||
|
||||
|
||||
@media screen and (max-width: 767px) {
|
||||
aside#region_1 {
|
||||
|
||||
@ -250,6 +250,16 @@ if(! $a->install) {
|
||||
$reply_photo = '32px';
|
||||
if(! $infomess_bgcolour)
|
||||
$infomess_bgcolour = "#F0F0F0";
|
||||
if(! $advperm_bgcolour)
|
||||
$advperm_bgcolour = "#F5F5F5";
|
||||
if(! $advperm_bordercol)
|
||||
$advperm_bordercol = "#E3E3E3";
|
||||
if(! $advperm_gradientcol)
|
||||
$advperm_gradientcol = "#E8E8E8";
|
||||
if(! $cal_bgcolour)
|
||||
$cal_bgcolour = "#FCF8E3";
|
||||
if(! $fancybox_bgcolour)
|
||||
$fancybox_bgcolour = "#FFF";
|
||||
if (!$comment_padding)
|
||||
$comment_padding="0px";
|
||||
if (!$comment_border_left)
|
||||
@ -366,6 +376,11 @@ $options = array (
|
||||
'$top_photo' => $top_photo,
|
||||
'$reply_photo' => $reply_photo,
|
||||
'$infomess_bgcolour' => $infomess_bgcolour,
|
||||
'$advperm_bgcolour' => $advperm_bgcolour,
|
||||
'$advperm_bordercol' => $advperm_bordercol,
|
||||
'$advperm_gradientcol' => $advperm_gradientcol,
|
||||
'$cal_bgcolour' => $cal_bgcolour,
|
||||
'$fancybox_bgcolour' => $fancybox_bgcolour,
|
||||
'$pmenu_top' => $pmenu_top,
|
||||
'$pmenu_reply' => $pmenu_reply,
|
||||
'$wwtop' => $wwtop,
|
||||
|
||||
@ -154,3 +154,13 @@
|
||||
$abookself_bgcolour = "#251111";
|
||||
if(! $infomess_bgcolour)
|
||||
$infomess_bgcolour = "#333";
|
||||
if(! $advperm_bgcolour)
|
||||
$advperm_bgcolour = "#1E1E1E";
|
||||
if(! $advperm_bordercol)
|
||||
$advperm_bordercol = "#222";
|
||||
if(! $advperm_gradientcol)
|
||||
$advperm_gradientcol = "#111";
|
||||
if(! $cal_bgcolour)
|
||||
$cal_bgcolour = "#333";
|
||||
if(! $fancybox_bgcolour)
|
||||
$fancybox_bgcolour = "#1E1E1E";
|
||||
|
||||
Reference in New Issue
Block a user