OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-07-11 21:42:02 +02:00
parent 65359eaadb 641b17ae8c
commit 29f333e077
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/okapi/core.php
View File

@ -814,7 +814,7 @@ class Okapi
{
public static $data_store;
public static $server;
public static $revision = 869; # This gets replaced in automatically deployed packages
public static $revision = 871; # This gets replaced in automatically deployed packages
private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */

BIN
htdocs/okapi/locale/pl_PL/LC_MESSAGES/okapi_messages.mo
View File

Binary file not shown.

42
htdocs/okapi/locale/pl_PL/LC_MESSAGES/okapi_messages.po
View File

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OKAPI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-08 15:17+0100\n"
"PO-Revision-Date: 2013-05-08 15:25+0100\n"
"POT-Creation-Date: 2013-07-11 08:28+0100\n"
"PO-Revision-Date: 2013-07-11 08:35+0100\n"
"Last-Translator: Wojciech Rygielski <rygielski@mimuw.edu.pl>\n"
"Language-Team: \n"
"Language: pl_PL\n"
@ -19,18 +19,22 @@ msgstr ""
"X-Generator: Poedit 1.5.5\n"
"X-Poedit-SearchPath-0: .\n"
#: services/caches/geocaches.php:911
#: services/caches/geocaches.php:956
msgid "Stage"
msgstr "Etap"
#: services/caches/geocaches.php:1139
#: services/caches/geocaches.php:1111
msgid "National Park / Landscape"
msgstr "Park narodowy lub krajobrazowy"
#: services/caches/geocaches.php:1263
#, php-format
msgid ""
"This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</"
"a> site."
msgstr "Opis <a href='%s'>skrzynki</a> pochodzi z serwisu <a href='%s'>%s</a>."
#: services/caches/geocaches.php:1151
#: services/caches/geocaches.php:1275
#, php-format
msgid ""
"&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://"
@ -41,7 +45,7 @@ msgstr ""
"creativecommons.org/licenses/by-nc-nd/3.0/de/deed.pl'>CC-BY-NC-ND</a>, w "
"dniu %s. Prawa autorskie wpisów do logów należą do ich autorów."
#: services/caches/geocaches.php:1162
#: services/caches/geocaches.php:1286
#, php-format
msgid ""
"&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://"
@ -53,11 +57,11 @@ msgstr ""
"autorskie wpisów do logów należą do ich autorów."
#: services/caches/formatters/gpxfile.tpl.php:31
#: services/caches/formatters/gpxfile.tpl.php:48
#: services/caches/formatters/gpxfile.tpl.php:60
msgid "hidden by"
msgstr "ukryta przez"
#: services/caches/formatters/gpxfile.tpl.php:50
#: services/caches/formatters/gpxfile.tpl.php:62
#, php-format
msgid "%d recommendation"
msgid_plural "%d recommendations"
@ -65,7 +69,7 @@ msgstr[0] "%d rekomendacja"
msgstr[1] "%d rekomendacje"
msgstr[2] "%d rekomendacji"
#: services/caches/formatters/gpxfile.tpl.php:51
#: services/caches/formatters/gpxfile.tpl.php:63
#, php-format
msgid "found %d time"
msgid_plural "found %d times"
@ -73,7 +77,7 @@ msgstr[0] "znaleziona %d raz"
msgstr[1] "znaleziona %d razy"
msgstr[2] "znaleziona %d razy"
#: services/caches/formatters/gpxfile.tpl.php:54
#: services/caches/formatters/gpxfile.tpl.php:66
#, php-format
msgid "%d trackable"
msgid_plural "%d trackables"
@ -81,31 +85,35 @@ msgstr[0] "%d GeoKret (lub TravelBug)"
msgstr[1] "%d GeoKrety (lub TravelBugi)"
msgstr[2] "%d GeoKretów (lub TravelBugów)"
#: services/caches/formatters/gpxfile.tpl.php:58
#: services/caches/formatters/gpxfile.tpl.php:70
msgid "Personal notes"
msgstr "Osobiste notatki"
#: services/caches/formatters/gpxfile.tpl.php:62
#: services/caches/formatters/gpxfile.tpl.php:74
msgid "Attributes"
msgstr "Atrybuty"
#: services/caches/formatters/gpxfile.tpl.php:66
#: services/caches/formatters/gpxfile.tpl.php:78
msgid "Trackables"
msgstr "Geokrety, Travelbugi itp."
#: services/caches/formatters/gpxfile.tpl.php:76
#: services/caches/formatters/gpxfile.tpl.php:92
#: services/caches/formatters/gpxfile.tpl.php:88
#: services/caches/formatters/gpxfile.tpl.php:104
msgid "Images"
msgstr "Obrazki"
#: services/caches/formatters/gpxfile.tpl.php:99
#: services/caches/formatters/gpxfile.tpl.php:111
msgid "Spoilers"
msgstr "Spoilery"
#: services/caches/formatters/gpxfile.tpl.php:108
#: services/caches/formatters/gpxfile.tpl.php:120
msgid "Image descriptions"
msgstr "Opisy obrazków"
#: services/caches/formatters/gpxfile.tpl.php:128
msgid "The cache probably is located in the following protection areas:"
msgstr "Prawdopodobnie skrzynka znajduje się na terenie obszarów chronionych:"
#: services/logs/submit.php:70
msgid ""
"You are trying to publish a log entry with a date in future. Cache log "

10
htdocs/okapi/services/caches/formatters/gpx.xml
View File

@ -71,7 +71,7 @@
<p>In the future, more generic ways of including images in GPX files may emerge.</p>
</opt>
<opt name='attrs' default='desc:text'>
<p>This argument controls wether cache attributes are included and how they are included.
<p>This argument controls whether cache attributes are included and how they are included.
Pipe-separated list consisting of any set of the following values:</p>
<ul>
@ -103,10 +103,10 @@
trigger the default (<b>desc:text</b>) to be selected, for backward-compatibility.</p>
</opt>
<opt name='protection_areas' default='desc:auto'>
<p>This argument controls wether protection area information is included and how
<p>This argument controls whether protection area information is included and how
it is included.</p>
<ul>
<li><b>desc:text</b> - if the cache is (probably) located within one or more
<li><b>desc:text</b> - if the cache (probably) is located within one or more
protection areas, e.g. a nature reserve, a list of the protection areas will
be included in the cache description.</li>
<li><b>desc:auto</b> - protection area information may be included in the
@ -118,7 +118,7 @@
or completely missing on some installations.</p>
</opt>
<opt name='trackables' default='none'>
<p>This argument controls wether information on trackables is included and how it is included.
<p>This argument controls whether information on trackables is included and how it is included.
One of the following values:</p>
<ul>
<li><b>none</b> - no trackables-data will be included,</li>
@ -128,7 +128,7 @@
<p>Note: When using "desc:" mode, remember to set <b>ns_ground</b> to <b>true</b>.</p>
</opt>
<opt name='recommendations' default='none'>
<p>This argument controls wether information on recommendations is included and how it is included.
<p>This argument controls whether information on recommendations is included and how it is included.
One of the following values:</p>
<ul>
<li><b>none</b> - no recommendations-info will be included,</li>