From: Hypolite Petovan Date: Fri, 13 Apr 2018 11:41:33 +0000 (-0400) Subject: Merge pull request #4824 from M-arcus/patch-1 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=60e8ada6d612029d868621850ef2110af1aa75a8;hp=3761797e5fde26ecc89493789f5885aa2a176322;p=friendica.git Merge pull request #4824 from M-arcus/patch-1 [BUGFIX] DB: Don't check DNS on IPs --- diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md index 550a00e5a9..7434fc0498 100644 --- a/doc/Accesskeys.md +++ b/doc/Accesskeys.md @@ -1,81 +1,88 @@ -Accesskeys in Friendica +Accesskeys reference ======================= * [Home](help) -For an overview of the modifier key of the different browsers we suggest this [Wikipedia](https://en.wikipedia.org/wiki/Access_key) article. +Access keys are keyboard shortcuts that allow you to easily navigate the user interface. +Access keys are currently not available with the Frio theme. + +The specific key combinations depend on how your browser's the modifier key setting. +For an overview of modifier keys in different browsers, have a lookat [Wikipedia](https://en.wikipedia.org/wiki/Access_key) article. +For example, for moving to profile page in Firefox, press these three keys simultaneously. + +[Shift] [Alt] [p] General ------- -* p: profile -* n: network -* c: community -* s: search -* a: admin -* f: notifications -* u: user menu (in themes "vier" and "quattro") +* p - Profile +* n - Network +* c - Community +* s - Search +* a - Admin +* f - Notifications +* u - User menu -/community +../community -------- -* l: Local community -* g: Global community +* l - Local community +* g - Global community -/profile +../profile -------- -* m: Status Messages and Posts -* r: Profile Details -* h: Photo Albums -* v: Videos -* e: Events and Calendar -* t: Personal Notes -* k: View Contacts +* m - Status Messages and Posts +* r - Profile Details +* h - Photo Albums +* v - Videos +* e - Events and Calendar +* t - Personal Notes +* k - View Contacts -/contacts (contact list) +../contacts (contact list) --------- -* g: Suggestions -* l: Show all Contacts -* o: Only show unblocked contacts -* b: Only show blocked contacts -* i: Only show ignored contacts -* y: Only show archived contacts -* h: Only show hidden contacts +* g - Suggestions +* l - Show all Contacts +* o - Only show unblocked contacts +* b - Only show blocked contacts +* i - Only show ignored contacts +* y - Only show archived contacts +* h - Only show hidden contacts -/contacts (single contact view) +../contacts (single contact view) ------------------------------- -* m: Status messages -* o: Profile -* t: Contacts -* d: Common friends -* r: Advanced +* m - Status messages +* o - Profile +* t - Contacts +* d - Common friends +* r - Advanced -/message +../message -------- -* m: New message +* m - New message -/network +../network -------- -* e: Sort by Comment Date -* t: Sort by Post Date -* r: Conversation (Posts that mention or involve you) -* w: New posts -* b: Bookmarks -* m: Favourite Posts +* e - Sort by Comment Date +* t - Sort by Post Date +* r - Conversation (Posts that mention or involve you) +* w - New posts +* b - Bookmarks +* m - Favourite Posts -/notifications +../notifications -------------- -* y: System -* w: Network -* r: Personal -* h: Home -* i: Introductions +* y - System +* w - Network +* r - Personal +* h - Home +* i - Introductions -/settings +../settings --------- -* o: Account -* t: Additional features -* w: Social Networks -* l: Addons -* d: Delegations -* b: Connected apps -* e: Export personal data -* r: Remove account +* o - Account +* t - Additional features +* w - Social Networks +* l - Addons +* d - Delegations +* b - Connected apps +* e - Export personal data +* r - Remove account diff --git a/view/lang/fi-fi/messages.po b/view/lang/fi-fi/messages.po index c49bde651b..172fe8ec33 100644 --- a/view/lang/fi-fi/messages.po +++ b/view/lang/fi-fi/messages.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-06 16:58+0200\n" -"PO-Revision-Date: 2018-04-10 18:27+0000\n" +"PO-Revision-Date: 2018-04-12 15:55+0000\n" "Last-Translator: Kris\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -1298,15 +1298,15 @@ msgstr "Ole hyvä ja paina selaimesi 'Takaisin'-painiketta nyt, #: mod/crepair.php:129 mod/crepair.php:131 msgid "No mirroring" -msgstr "" +msgstr "Ei peilausta" #: mod/crepair.php:129 msgid "Mirror as forwarded posting" -msgstr "" +msgstr "Peilaa välitettynä julkaisuna" #: mod/crepair.php:129 mod/crepair.php:131 msgid "Mirror as my own posting" -msgstr "" +msgstr "Peilaa omana julkaisuna" #: mod/crepair.php:144 msgid "Return to contact editor" @@ -1334,7 +1334,7 @@ msgstr "" #: mod/crepair.php:152 msgid "Mirror postings from this contact" -msgstr "" +msgstr "Peilaa tämän kontaktin julkaisut" #: mod/crepair.php:154 msgid "" @@ -1561,7 +1561,7 @@ msgstr "" #: mod/newmember.php:40 msgid "Go to Your Site's Directory" -msgstr "" +msgstr "Näytä oman sivuston luettelo" #: mod/newmember.php:40 msgid "" @@ -1615,7 +1615,7 @@ msgstr "Avun saaminen" #: mod/newmember.php:54 msgid "Go to the Help Section" -msgstr "" +msgstr "Näytä ohjeet" #: mod/newmember.php:54 msgid "" @@ -1956,7 +1956,7 @@ msgstr "" #: mod/dfrn_confirm.php:396 msgid "Unable to set contact photo." -msgstr "" +msgstr "Kontaktin kuvaa ei voitu asettaa" #: mod/dfrn_confirm.php:498 #, php-format @@ -2387,7 +2387,7 @@ msgstr "" #: mod/profperm.php:115 mod/group.php:265 msgid "Click on a contact to add or remove." -msgstr "" +msgstr "Valitse kontakti, jota haluat poistaa tai lisätä." #: mod/profperm.php:124 msgid "Visible To" @@ -4861,7 +4861,7 @@ msgstr "" #: mod/lostpass.php:102 msgid "Request has expired, please make a new one." -msgstr "" +msgstr "Pyyntö on vanhentunut, tehkää uusi pyyntö." #: mod/lostpass.php:117 msgid "Forgot your Password?" @@ -4955,7 +4955,7 @@ msgstr "Rekisteröityminen onnistui." #: mod/register.php:115 msgid "Your registration can not be processed." -msgstr "" +msgstr "Rekisteröintisi ei voida käsitellä." #: mod/register.php:162 msgid "Your registration is pending approval by the site owner." @@ -5597,7 +5597,7 @@ msgstr "Tiedoston lataus" #: mod/admin.php:1350 msgid "Policies" -msgstr "" +msgstr "Käytännöt" #: mod/admin.php:1352 msgid "Auto Discovered Contact Directory" diff --git a/view/lang/nl/messages.po b/view/lang/nl/messages.po index b3665824e4..43ddd04cb6 100644 --- a/view/lang/nl/messages.po +++ b/view/lang/nl/messages.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-06 16:58+0200\n" -"PO-Revision-Date: 2018-04-11 14:34+0000\n" +"PO-Revision-Date: 2018-04-12 13:16+0000\n" "Last-Translator: Karel \n" "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n" "MIME-Version: 1.0\n" @@ -1649,7 +1649,7 @@ msgstr "" #: mod/repair_ostatus.php:34 msgid "Error" -msgstr "" +msgstr "Fout" #: mod/repair_ostatus.php:48 mod/ostatus_subscribe.php:64 msgid "Done" @@ -5653,7 +5653,7 @@ msgstr "" #: mod/admin.php:1364 msgid "Touch icon" -msgstr "" +msgstr "Pictogram voor smartphones" #: mod/admin.php:1364 msgid "Link to an icon that will be used for tablets and mobiles." diff --git a/view/lang/nl/strings.php b/view/lang/nl/strings.php index 64ba695248..5b74f580a2 100644 --- a/view/lang/nl/strings.php +++ b/view/lang/nl/strings.php @@ -370,7 +370,7 @@ $a->strings["Edit contact"] = "Contact bewerken"; $a->strings["Contacts who are not members of a group"] = "Contacten die geen leden zijn van een groep"; $a->strings["Not Extended"] = ""; $a->strings["Resubscribing to OStatus contacts"] = ""; -$a->strings["Error"] = ""; +$a->strings["Error"] = "Fout"; $a->strings["Done"] = "Klaar"; $a->strings["Keep this window open until done."] = "Houd dit scherm open tot het klaar is"; $a->strings["Do you really want to delete this suggestion?"] = "Wil je echt dit voorstel verwijderen?"; @@ -1289,7 +1289,7 @@ $a->strings["The email address your server shall use to send notification emails $a->strings["Banner/Logo"] = "Banner/Logo"; $a->strings["Shortcut icon"] = ""; $a->strings["Link to an icon that will be used for browsers."] = ""; -$a->strings["Touch icon"] = ""; +$a->strings["Touch icon"] = "Pictogram voor smartphones"; $a->strings["Link to an icon that will be used for tablets and mobiles."] = ""; $a->strings["Additional Info"] = ""; $a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "";