aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-28 18:01:32 -0700
committerfriendica <info@friendica.com>2014-05-28 18:01:32 -0700
commit53ea6b05a644c75810a95e351021251f0f759e9f (patch)
tree4f19cbc9cd1f5ef9d5b5ba19a17e23247ef15fa5
parent30eb1b494a403acf0bcad461907ece77c707d574 (diff)
parent500c19481dbf3df8247bd162e21115103879cc1c (diff)
downloadvolse-hubzilla-53ea6b05a644c75810a95e351021251f0f759e9f.tar.gz
volse-hubzilla-53ea6b05a644c75810a95e351021251f0f759e9f.tar.bz2
volse-hubzilla-53ea6b05a644c75810a95e351021251f0f759e9f.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--doc/developers.bb2
-rw-r--r--doc/main.bb1
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/developers.bb b/doc/developers.bb
index 0855852d2..ae3d4aa90 100644
--- a/doc/developers.bb
+++ b/doc/developers.bb
@@ -21,7 +21,7 @@ to notify us to merge your work.
Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.
-[zrl=https://friendicared.net/pages/doc/translations]Translations - More Info[/zrl]
+[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl]
[b]Important[/b]
diff --git a/doc/main.bb b/doc/main.bb
index 634bb524c..1d44188a8 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -42,6 +42,7 @@
[zrl=[baseurl]/help/plugins]Plugins[/zrl]
[zrl=[baseurl]/help/DerivedTheme1]Creating Derivative Themes[/zrl]
[zrl=[baseurl]/help/schema_development]Schemas[/zrl]
+[zrl=[baseurl]/help/Translations]Translations[/zrl]
[zrl=[baseurl]/help/developers]Developers[/zrl]
[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl]
[zrl=[baseurl]/help/api_functions]API functions[/zrl]