diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/macros | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'doc/macros')
| -rw-r--r-- | doc/macros/addons_footer.bb | 2 | ||||
| -rw-r--r-- | doc/macros/de/addons_footer.bb | 2 | ||||
| -rw-r--r-- | doc/macros/de/cloud_footer.bb | 2 | ||||
| -rw-r--r-- | doc/macros/de/main_footer.bb | 1 | ||||
| -rw-r--r-- | doc/macros/de/troubleshooting_footer.bb | 2 |
5 files changed, 8 insertions, 1 deletions
diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb index f6b687a23..32814c59b 100644 --- a/doc/macros/addons_footer.bb +++ b/doc/macros/addons_footer.bb @@ -1,2 +1,2 @@ Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl] -Return to the [zrl=[baseurl]/help/addons]Main documentation[/zrl] +Return to the [zrl=[baseurl]/help/main]Main documentation[/zrl] diff --git a/doc/macros/de/addons_footer.bb b/doc/macros/de/addons_footer.bb new file mode 100644 index 000000000..068bb7ec7 --- /dev/null +++ b/doc/macros/de/addons_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/addons]Addons-Hilfe[/zrl] +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/cloud_footer.bb b/doc/macros/de/cloud_footer.bb new file mode 100644 index 000000000..921448a3c --- /dev/null +++ b/doc/macros/de/cloud_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/cloud]Cloud-Hilfe[/zrl] +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/main_footer.bb b/doc/macros/de/main_footer.bb new file mode 100644 index 000000000..e71603626 --- /dev/null +++ b/doc/macros/de/main_footer.bb @@ -0,0 +1 @@ +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/troubleshooting_footer.bb b/doc/macros/de/troubleshooting_footer.bb new file mode 100644 index 000000000..be8c13a28 --- /dev/null +++ b/doc/macros/de/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/troubleshooting]Troubleshooting-Startseite[/zrl] +Zurück zur [zrl=[baseurl]/help/troubleshooting]Hilfe-Startseite[/zrl] |