aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/ca/messages.po2
-rw-r--r--view/ca/strings.php2
-rw-r--r--view/de/messages.po2
-rw-r--r--view/de/strings.php2
-rw-r--r--view/eo/messages.po28
-rw-r--r--view/eo/strings.php26
-rw-r--r--view/es/messages.po2
-rw-r--r--view/es/strings.php2
-rw-r--r--view/fr/messages.po2
-rw-r--r--view/fr/strings.php2
-rw-r--r--view/it/messages.po2
-rw-r--r--view/it/strings.php2
-rw-r--r--view/theme/dispy-dark/nav.tpl68
-rw-r--r--view/theme/dispy-dark/style.css38
-rw-r--r--view/theme/dispy/nav.tpl68
-rw-r--r--view/theme/dispy/style.css11
16 files changed, 144 insertions, 115 deletions
diff --git a/view/ca/messages.po b/view/ca/messages.po
index 8463ceb12..25c3ce6dc 100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@@ -2910,7 +2910,7 @@ msgstr "Comptes abandonats després de x dies"
#: ../../mod/admin.php:330
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
diff --git a/view/ca/strings.php b/view/ca/strings.php
index e5aed8be6..265058391 100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@@ -654,7 +654,7 @@ $a->strings["Register policy"] = "Política per a registrar";
$a->strings["Register text"] = "Text al registrar";
$a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
$a->strings["Allowed friend domains"] = "Dominis amics permesos";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
$a->strings["Allowed email domains"] = "Dominis de correu permesos";
diff --git a/view/de/messages.po b/view/de/messages.po
index e3f38f66c..5b0b9ece4 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -3126,7 +3126,7 @@ msgstr "Accounts gelten nach x Tagen als unbenutzt"
#: ../../mod/admin.php:391
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
diff --git a/view/de/strings.php b/view/de/strings.php
index b0b68fc1e..13f6f716e 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -688,7 +688,7 @@ $a->strings["Register policy"] = "Registrierungsmethode";
$a->strings["Register text"] = "Registrierungstext";
$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
diff --git a/view/eo/messages.po b/view/eo/messages.po
index 75879c489..dea7d919d 100644
--- a/view/eo/messages.po
+++ b/view/eo/messages.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-04-16 10:00-0700\n"
-"PO-Revision-Date: 2012-04-17 20:23+0000\n"
+"PO-Revision-Date: 2012-04-18 17:16+0000\n"
"Last-Translator: Martin Schmitt <mas@scsy.de>\n"
"Language-Team: Esperanto (http://www.transifex.net/projects/p/friendica/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -1360,7 +1360,7 @@ msgstr "%s kreis novan afiŝon"
#: ../../mod/notifications.php:497
#, php-format
msgid "%s commented on %s's post"
-msgstr "%s komentis pri la afiŝon de %s"
+msgstr "%s komentis pri la afiŝo de %s"
#: ../../mod/notifications.php:298
msgid "No more network notifications."
@@ -2657,7 +2657,7 @@ msgstr "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registrado
msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'."
-msgstr "Vi ankaŭ (nedeviga) povas plenigi la formularo tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
+msgstr "Vi ankaŭ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
#: ../../mod/register.php:514
msgid ""
@@ -3117,7 +3117,7 @@ msgstr "Kontoj forlasitaj post x tagoj"
#: ../../mod/admin.php:391
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo."
@@ -3470,7 +3470,7 @@ msgstr "{0} petis registradon"
#: ../../mod/ping.php:191
#, php-format
msgid "{0} commented %s's post"
-msgstr "{0} komentis pri la afiŝon de %s"
+msgstr "{0} komentis pri la afiŝo de %s"
#: ../../mod/ping.php:196
#, php-format
@@ -5576,7 +5576,7 @@ msgstr "Hejmpaĝo:"
#: ../../include/profile_advanced.php:47
msgid "Tags:"
-msgstr "Tags:"
+msgstr "Markoj:"
#: ../../include/profile_advanced.php:51
msgid "Religion:"
@@ -5860,7 +5860,7 @@ msgstr "Edziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Imaginarily married"
-msgstr "Image edziiĝinta"
+msgstr "Image edziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Partners"
@@ -5904,7 +5904,7 @@ msgstr "Eksedziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Imaginarily divorced"
-msgstr "Image maledziiĝinta"
+msgstr "Image eksedziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Widowed"
@@ -6490,7 +6490,7 @@ msgstr "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesaĝojn."
#: ../../include/enotify.php:73
#, php-format
msgid "%s's"
-msgstr "de %s"
+msgstr "de %s verkita"
#: ../../include/enotify.php:77
msgid "your"
@@ -6509,7 +6509,7 @@ msgstr "%s komentis pri elemento/konversacio kiun vi sekvas."
#: ../../include/enotify.php:86
#, php-format
msgid "%s commented on %s."
-msgstr "%s komentis pri %s"
+msgstr "%s komentis pri %s."
#: ../../include/enotify.php:88 ../../include/enotify.php:101
#: ../../include/enotify.php:112 ../../include/enotify.php:123
@@ -6660,7 +6660,7 @@ msgstr "Bonvolu alŝuti profilbildon."
#: ../../include/security.php:25
msgid "Welcome back "
-msgstr "Bonvenon"
+msgstr "Bonvenon "
#: ../../include/security.php:329
msgid ""
@@ -6923,7 +6923,7 @@ msgstr "Mesaĝo"
#: ../../boot.php:1151 ../../boot.php:1223
msgid "g A l F d"
-msgstr "g A l F d"
+msgstr "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d"
#: ../../boot.php:1152 ../../boot.php:1224
msgid "F d"
@@ -6931,11 +6931,11 @@ msgstr "F d"
#: ../../boot.php:1177
msgid "Birthday Reminders"
-msgstr "Memorigiloj por naskiĝtagoj"
+msgstr "Memorigilo pri naskiĝtagoj"
#: ../../boot.php:1178
msgid "Birthdays this week:"
-msgstr "Naskiĝtagoj ĉi-semajne"
+msgstr "Naskiĝtagoj ĉi-semajne:"
#: ../../boot.php:1201 ../../boot.php:1266
msgid "[today]"
diff --git a/view/eo/strings.php b/view/eo/strings.php
index 3f3630afd..33c856ed0 100644
--- a/view/eo/strings.php
+++ b/view/eo/strings.php
@@ -285,7 +285,7 @@ $a->strings["%s liked %s's post"] = "%s ŝatis la afiŝon de %s";
$a->strings["%s disliked %s's post"] = "%s malŝatis la afiŝon de %s";
$a->strings["%s is now friends with %s"] = "%s amikiĝis kun %s";
$a->strings["%s created a new post"] = "%s kreis novan afiŝon";
-$a->strings["%s commented on %s's post"] = "%s komentis pri la afiŝon de %s";
+$a->strings["%s commented on %s's post"] = "%s komentis pri la afiŝo de %s";
$a->strings["No more network notifications."] = "Ne pli da retaj atentigoj.";
$a->strings["Network Notifications"] = "Retaj Atentigoj";
$a->strings["No more system notifications."] = "Ne pli da sistemaj atentigoj.";
@@ -585,7 +585,7 @@ $a->strings["Your registration can not be processed."] = "Mi ne povas prilabori
$a->strings["Registration request at %s"] = "Peto de registrado al %s";
$a->strings["Your registration is pending approval by the site owner."] = "Via registrado bezonas apropbon de la administranto.";
$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registradoj. Bonvolu provi denove morgaŭ.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaŭ (nedeviga) povas plenigi la formularo tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaŭ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Se vi ne konas OpenID, bonvolu lasi tiun kampon malplena kaj entajpu la aliajn elementojn.";
$a->strings["Your OpenID (optional): "] = "Via OpenID (nedeviga):";
$a->strings["Include your profile in member directory?"] = "Aldoni vian profilon al la membrokatalogo?";
@@ -688,7 +688,7 @@ $a->strings["Register policy"] = "Interkonsento pri registrado";
$a->strings["Register text"] = "Interkonsento teksto";
$a->strings["Will be displayed prominently on the registration page."] = "Tio estos eminente montrata en la registro paĝo.";
$a->strings["Accounts abandoned after x days"] = "Kontoj forlasitaj post x tagoj";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
$a->strings["Allowed friend domains"] = "Permesitaj amikaj domainoj";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn.";
$a->strings["Allowed email domains"] = "Permesitaj retpoŝtaj domajnoj";
@@ -772,7 +772,7 @@ $a->strings["Tips for New Members"] = "Konsilo por novaj membroj";
$a->strings["{0} wants to be your friend"] = "{0} volas amikiĝi kun vi";
$a->strings["{0} sent you a message"] = "{0} sendis mesaĝon al vi";
$a->strings["{0} requested registration"] = "{0} petis registradon";
-$a->strings["{0} commented %s's post"] = "{0} komentis pri la afiŝon de %s";
+$a->strings["{0} commented %s's post"] = "{0} komentis pri la afiŝo de %s";
$a->strings["{0} liked %s's post"] = "{0} satis la afiŝon de %s";
$a->strings["{0} disliked %s's post"] = "{0} malŝatis la afiŝon de %s";
$a->strings["{0} is now friends with %s"] = "{0} amikiĝis kun %s";
@@ -1238,7 +1238,7 @@ $a->strings["Birthday:"] = "Naskiĝtago:";
$a->strings["Age:"] = "Aĝo:";
$a->strings["Status:"] = "Stato:";
$a->strings["Homepage:"] = "Hejmpaĝo:";
-$a->strings["Tags:"] = "Tags:";
+$a->strings["Tags:"] = "Markoj:";
$a->strings["Religion:"] = "Religio:";
$a->strings["About:"] = "Pri:";
$a->strings["Hobbies/Interests:"] = "Ŝatokupoj/Interesoj:";
@@ -1309,7 +1309,7 @@ $a->strings["Friends/Benefits"] = "Amikoj/Avantaĝoj";
$a->strings["Casual"] = "Neformala";
$a->strings["Engaged"] = "Fianĉiginta";
$a->strings["Married"] = "Edziĝinta";
-$a->strings["Imaginarily married"] = "Image edziiĝinta";
+$a->strings["Imaginarily married"] = "Image edziĝinta";
$a->strings["Partners"] = "Geparuloj";
$a->strings["Cohabiting"] = "Kunloĝanta";
$a->strings["Common law"] = "Registrita partnereco ";
@@ -1320,7 +1320,7 @@ $a->strings["Betrayed"] = "Trompita";
$a->strings["Separated"] = "Disiĝinta";
$a->strings["Unstable"] = "Malfirma";
$a->strings["Divorced"] = "Eksedziĝinta";
-$a->strings["Imaginarily divorced"] = "Image maledziiĝinta";
+$a->strings["Imaginarily divorced"] = "Image eksedziĝinta";
$a->strings["Widowed"] = "Vidva";
$a->strings["Uncertain"] = "Ne certa";
$a->strings["It's complicated"] = "Estas komplika";
@@ -1467,11 +1467,11 @@ $a->strings["%s sent you a new private message at %s."] = "%s sendis novan mesa
$a->strings["%s sent you %s."] = "%s sendis al vi %s.";
$a->strings["a private message"] = "privatan mesaĝon";
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesaĝojn.";
-$a->strings["%s's"] = "de %s";
+$a->strings["%s's"] = "de %s verkita";
$a->strings["your"] = "via";
$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica:Atentigo] Komento pri konversacio #%d de %s";
$a->strings["%s commented on an item/conversation you have been following."] = "%s komentis pri elemento/konversacio kiun vi sekvas.";
-$a->strings["%s commented on %s."] = "%s komentis pri %s";
+$a->strings["%s commented on %s."] = "%s komentis pri %s.";
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bonvolu viziti %s por vidi aŭ respondi la konversacion.";
$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Atentigo] %s afiŝis al via profilmuro";
$a->strings["%s posted to your profile wall at %s"] = "%s skribis al via profila muro ĉe %s";
@@ -1504,7 +1504,7 @@ $a->strings["image/photo"] = "bildo";
$a->strings["link"] = "ligilo";
$a->strings["Welcome "] = "Bonvenon ";
$a->strings["Please upload a profile photo."] = "Bonvolu alŝuti profilbildon.";
-$a->strings["Welcome back "] = "Bonvenon";
+$a->strings["Welcome back "] = "Bonvenon ";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La sekuriga ĵetono de la formo estis malĝusta. Tio verŝajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado.";
$a->strings["View Status"] = "Vidi Staton";
$a->strings["View Profile"] = "Vidi Profilon";
@@ -1568,10 +1568,10 @@ $a->strings["Or login using OpenID: "] = "Aŭ ensaluti per OpenID:";
$a->strings["Forgot your password?"] = "Ĉu vi vorgesis vian pasvorton?";
$a->strings["Edit profile"] = "Redakti profilon";
$a->strings["Message"] = "Mesaĝo";
-$a->strings["g A l F d"] = "g A l F d";
+$a->strings["g A l F d"] = "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d";
$a->strings["F d"] = "F d";
-$a->strings["Birthday Reminders"] = "Memorigiloj por naskiĝtagoj";
-$a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne";
+$a->strings["Birthday Reminders"] = "Memorigilo pri naskiĝtagoj";
+$a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne:";
$a->strings["[today]"] = "[hodiaŭ]";
$a->strings["Event Reminders"] = "Memorigiloj pri Okazoj";
$a->strings["Events this week:"] = "Okazoj ĉi-semajne:";
diff --git a/view/es/messages.po b/view/es/messages.po
index d3f8557e9..54de3ee64 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -3136,7 +3136,7 @@ msgstr "Cuentas abandonadas después de x días"
#: ../../mod/admin.php:313
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr ""
"No gastará recursos del sistema creando encuestas desde sitios externos para"
diff --git a/view/es/strings.php b/view/es/strings.php
index ac53a45a9..d2b8e240e 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
$a->strings["Register policy"] = "Política de registros";
$a->strings["Register text"] = "Términos";
$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
$a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
$a->strings["Allowed email domains"] = "Dominios de correo permitidos";
$a->strings["Block public"] = "Bloqueo público";
diff --git a/view/fr/messages.po b/view/fr/messages.po
index 345405760..5628299b8 100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -3111,7 +3111,7 @@ msgstr "Les comptes sont abandonnés après x jours"
#: ../../mod/admin.php:313
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr ""
"Pour ne pas gaspiller les ressources système, on cesse d'interroger les "
diff --git a/view/fr/strings.php b/view/fr/strings.php
index dda24d3be..e24070ab9 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Taille maximale des images";
$a->strings["Register policy"] = "Politique d'inscription";
$a->strings["Register text"] = "Texte d'inscription";
$a->strings["Accounts abandoned after x days"] = "Les comptes sont abandonnés après x jours";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
$a->strings["Allowed friend domains"] = "Domaines autorisés";
$a->strings["Allowed email domains"] = "Domaines courriel autorisés";
$a->strings["Block public"] = "Interdire la publication globale";
diff --git a/view/it/messages.po b/view/it/messages.po
index e0375764f..855a24ee8 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -3104,7 +3104,7 @@ msgstr "Account abbandonati dopo x giorni"
#: ../../mod/admin.php:313
msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr ""
"Non spreca risorse di sistema controllando siti esterni per gli account "
diff --git a/view/it/strings.php b/view/it/strings.php
index 5fd187f7a..93bcbd465 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Massima dimensione immagini";
$a->strings["Register policy"] = "Politica di registrazione";
$a->strings["Register text"] = "Testo registrazione";
$a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
$a->strings["Allowed friend domains"] = "Domini amici consentiti";
$a->strings["Allowed email domains"] = "Domini email consentiti";
$a->strings["Block public"] = "Blocca pagine pubbliche";
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index b58ae7e3a..a7beb63fc 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -2,48 +2,52 @@
<span id="banner">$banner</span>
-<!-- yes, they're going the other way. seems that's how the template renderer
-works -->
<a name="top" id="top"></a>
<div id="nav-floater">
- <div id="nav-buttons">
- {{ if $nav.help }}
- <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-link $nav.community.2"
- href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+ <ul id="nav-buttons">
+ {{ if $nav.login }}
+ <li><a id="nav-login-link" class="nav-login-link $nav.login.2"
+ href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
{{ endif }}
- {{ if $nav.apps }}
- <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+ {{ if $nav.home }}
+ <li><a id="nav-home-link" class="nav-link $nav.home.2"
+ href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
{{ endif }}
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-link $nav.messages.2"
- href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+ {{ if $nav.network }}
+ <li><a id="nav-network-link" class="nav-link $nav.network.2"
+ href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
{{ endif }}
{{ if $nav.notifications }}
- <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
- <ul id="nav-notifications-menu" class="menu-popup">
- <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
- <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
- <li class="empty">$emptynotifications</li>
- </ul>
+ <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2"
+ href="$nav.notifications.0"
+ rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
+ <ul id="nav-notifications-menu" class="menu-popup">
+ <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+ <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+ <li class="empty">$emptynotifications</li>
+ </ul>
{{ endif }}
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-link $nav.network.2"
- href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+ {{ if $nav.messages }}
+ <li><a id="nav-messages-link" class="nav-link $nav.messages.2"
+ href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
{{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-link $nav.home.2"
- href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+ {{ if $nav.community }}
+ <li><a id="nav-community-link" class="nav-link $nav.community.2"
+ href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
{{ endif }}
- {{ if $nav.login }}
- <a id="nav-login-link" class="nav-login-link $nav.login.2"
- href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+ <li><a id="nav-directory-link" class="nav-link $nav.directory.2"
+ href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+ <li><a id="nav-search-link" class="nav-link $nav.search.2"
+ href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
+ {{ if $nav.apps }}
+ <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
+ href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
+ {{ endif }}
+ {{ if $nav.help }}
+ <li><a id="nav-help-link" class="nav-link $nav.help.2"
+ href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
{{ endif }}
- </div>
+ </ul>
<div id="user-menu">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 9743800bf..02990c29a 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -8,11 +8,22 @@
/* from html5boilerplate */
/* these are to tell browsers they should be displayed a certain way */
-article, aside, details, figcaption, figure, footer,
-header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
display: block;
}
-audio, canvas, video, time {
+audio,
+canvas,
+video,
+time {
display: inline-block;
*display: inline;
*zoom: 1;
@@ -45,7 +56,11 @@ body {
font-size: 16px;
line-height: 1.1em;
}
-body, button, input, select, textarea {
+body,
+button,
+input,
+select,
+textarea {
font-family: sans-serif;
color: #eec;
background-color: #2e2f2e;
@@ -73,6 +88,10 @@ ul, ol {
:focus {
outline: 0;
}
+[disabled="disabled"] {
+ background: #4e4f4f;
+ color: #ddb;
+}
/* remember to highlight inserts somehow! */
ins {
@@ -321,8 +340,7 @@ ul#user-menu-popup li a.nav-sep {
border-top: 1px solid #eeeeec;
}
nav .nav-link {
- float: right;
- display: block;
+ display: inline-block;
width: 22px;
height: 22px;
overflow: hidden;
@@ -481,7 +499,7 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
width: 170px;
position: absolute;
top: -19px;
- left: 7px;
+ left: 4px;
}
#nav-floater {
position: fixed;
@@ -499,11 +517,13 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
clear: both;
list-style: none;
padding: 0px;
- margin: 0 7px 0 0;
+ margin: 0px;
height: 25px;
}
-#nav-buttons li {
+#nav-buttons > li {
padding: 0;
+ display: inline-block;
+ margin: 0px -4px 0px 0px;
}
.floaterflip {
display: block;
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index b58ae7e3a..a7beb63fc 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -2,48 +2,52 @@
<span id="banner">$banner</span>
-<!-- yes, they're going the other way. seems that's how the template renderer
-works -->
<a name="top" id="top"></a>
<div id="nav-floater">
- <div id="nav-buttons">
- {{ if $nav.help }}
- <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-link $nav.community.2"
- href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+ <ul id="nav-buttons">
+ {{ if $nav.login }}
+ <li><a id="nav-login-link" class="nav-login-link $nav.login.2"
+ href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
{{ endif }}
- {{ if $nav.apps }}
- <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+ {{ if $nav.home }}
+ <li><a id="nav-home-link" class="nav-link $nav.home.2"
+ href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
{{ endif }}
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-link $nav.messages.2"
- href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+ {{ if $nav.network }}
+ <li><a id="nav-network-link" class="nav-link $nav.network.2"
+ href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
{{ endif }}
{{ if $nav.notifications }}
- <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
- <ul id="nav-notifications-menu" class="menu-popup">
- <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
- <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
- <li class="empty">$emptynotifications</li>
- </ul>
+ <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2"
+ href="$nav.notifications.0"
+ rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
+ <ul id="nav-notifications-menu" class="menu-popup">
+ <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+ <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+ <li class="empty">$emptynotifications</li>
+ </ul>
{{ endif }}
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-link $nav.network.2"
- href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+ {{ if $nav.messages }}
+ <li><a id="nav-messages-link" class="nav-link $nav.messages.2"
+ href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
{{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-link $nav.home.2"
- href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+ {{ if $nav.community }}
+ <li><a id="nav-community-link" class="nav-link $nav.community.2"
+ href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
{{ endif }}
- {{ if $nav.login }}
- <a id="nav-login-link" class="nav-login-link $nav.login.2"
- href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+ <li><a id="nav-directory-link" class="nav-link $nav.directory.2"
+ href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+ <li><a id="nav-search-link" class="nav-link $nav.search.2"
+ href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
+ {{ if $nav.apps }}
+ <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
+ href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
+ {{ endif }}
+ {{ if $nav.help }}
+ <li><a id="nav-help-link" class="nav-link $nav.help.2"
+ href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
{{ endif }}
- </div>
+ </ul>
<div id="user-menu">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index bc2677b4a..5f48e68ec 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -340,8 +340,7 @@ ul#user-menu-popup li a.nav-sep {
border-top: 1px solid #eeeeec;
}
nav .nav-link {
- float: right;
- display: block;
+ display: inline-block;
width: 22px;
height: 22px;
overflow: hidden;
@@ -500,7 +499,7 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
width: 170px;
position: absolute;
top: -19px;
- left: 7px;
+ left: 4px;
}
#nav-floater {
position: fixed;
@@ -518,11 +517,13 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
clear: both;
list-style: none;
padding: 0px;
- margin: 0 7px 0 0;
+ margin: 0px;
height: 25px;
}
-#nav-buttons li {
+#nav-buttons > li {
padding: 0;
+ display: inline-block;
+ margin: 0px -4px 0px 0px;
}
.floaterflip {
display: block;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 05:19:25 +0000