diff options
| author | friendica <info@friendica.com> | 2014-07-10 19:30:08 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-10 19:30:08 -0700 |
| commit | f2c54cfcaf9d154970a4a4c99384e267f8699022 (patch) | |
| tree | fa606fad88cf3aefcc6ee737b789366e5cdab02d | |
| parent | 83ad5328c8b2ec3213a6368ed2203422c36435ff (diff) | |
| parent | 2a62ec49a7b4db3cca39ff1d01c338f7cf559386 (diff) | |
| download | volse-hubzilla-f2c54cfcaf9d154970a4a4c99384e267f8699022.tar.gz volse-hubzilla-f2c54cfcaf9d154970a4a4c99384e267f8699022.tar.bz2 volse-hubzilla-f2c54cfcaf9d154970a4a4c99384e267f8699022.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | doc/checking_account_quota_usage.bb | 6 | ||||
| -rw-r--r-- | doc/external-resource-links.bb | 1 | ||||
| -rw-r--r-- | view/nl/messages.po | 4 | ||||
| -rw-r--r-- | view/nl/strings.php | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb index 51bf69b27..5bf5b3163 100644 --- a/doc/checking_account_quota_usage.bb +++ b/doc/checking_account_quota_usage.bb @@ -6,12 +6,12 @@ Here's how you can quickly check how much of your assigned quota you're currentl [b]Check file storage quota levels[/b]
Visit the following URL in your browser:
-[observer.baseurl]/filestorage/webname
+[observer.baseurl]/filestorage/[observer.webname]
[b]Check uploaded photos storage quota levels[/b]
-[observer.baseurl]/photos/webname
+[observer.baseurl]/photos/[observer.webname]
Example:
-[observer.baseurl]/filestorage/webname
+[observer.baseurl]/filestorage/[observer.webname]
Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb index 787598c8a..b84096b50 100644 --- a/doc/external-resource-links.bb +++ b/doc/external-resource-links.bb @@ -6,6 +6,7 @@ [*][url=https://github.com/omigeot/redstrap3]Redstrap[/url]
[*][url=https://github.com/23n/Pluto]Pluto[/url]
[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]
+[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url]
[b]Third-Party Addons[/b]
[*][url=http://beardyunixer.com:1234/?p=red-addons.git;a=tree]Webpage/Publishing orientated addons and modules[/url]
diff --git a/view/nl/messages.po b/view/nl/messages.po index cbc21408f..7d375e4fe 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-04 00:02-0700\n" -"PO-Revision-Date: 2014-07-06 18:23+0000\n" +"PO-Revision-Date: 2014-07-09 18:59+0000\n" "Last-Translator: jeroenpraat <>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -1085,7 +1085,7 @@ msgstr "Beheer" #: ../../include/nav.php:199 msgid "Site Setup and Configuration" -msgstr "Red Matrix-hub opzetten en configureren" +msgstr "Hub instellen en beheren" #: ../../include/nav.php:224 msgid "Nothing new here" diff --git a/view/nl/strings.php b/view/nl/strings.php index 9c2a2a397..9fdd9e764 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -242,7 +242,7 @@ $a->strings["Manage Your Channels"] = "Beheer je kanalen"; $a->strings["Settings"] = "Instellingen"; $a->strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; $a->strings["Admin"] = "Beheer"; -$a->strings["Site Setup and Configuration"] = "Red Matrix-hub opzetten en configureren"; +$a->strings["Site Setup and Configuration"] = "Hub instellen en beheren"; $a->strings["Nothing new here"] = "Niets nieuw hier"; $a->strings["Please wait..."] = "Wachten aub..."; $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; |