From 5df058b2b3dc6e565ad3b3604263f487ef65f2af Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 14 Jul 2010 20:34:13 +0200 Subject: Sync with ikiwiki 3.20100704. --- aggregatepost.tmpl | 18 +++--- archivepage.tmpl | 14 ++++- atomitem.tmpl | 78 +++++++++++++----------- atompage.tmpl | 40 ++++++------ autotag.tmpl | 4 ++ blogpost.tmpl | 8 +-- calendarmonth.tmpl | 5 ++ calendaryear.tmpl | 1 + change.tmpl | 29 +++++---- comment.tmpl | 61 +++++++++++++++++++ commentmoderation.tmpl | 32 ++++++++++ editcomment.tmpl | 39 ++++++++++++ editpage.tmpl | 23 +++++-- feedlink.tmpl | 8 +-- googleform.tmpl | 6 +- inlinepage.tmpl | 56 ++++++++--------- microblog.tmpl | 22 +++++++ misc.tmpl | 35 ----------- openid-selector.tmpl | 43 +++++++++++++ page.tmpl | 162 +++++++++++++++++++++++++++++++++++-------------- pocreatepage.tmpl | 3 + renamesummary.tmpl | 4 +- rssitem.tmpl | 33 +++++----- searchform.tmpl | 3 +- searchquery.tmpl | 9 +-- titlepage.tmpl | 8 ++- 26 files changed, 518 insertions(+), 226 deletions(-) create mode 100644 autotag.tmpl create mode 100644 calendarmonth.tmpl create mode 100644 calendaryear.tmpl create mode 100644 comment.tmpl create mode 100644 commentmoderation.tmpl create mode 100644 editcomment.tmpl create mode 100644 microblog.tmpl delete mode 100644 misc.tmpl create mode 100644 openid-selector.tmpl create mode 100644 pocreatepage.tmpl diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 8b89367..4e89efe 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -1,15 +1,15 @@ - + [[!tag ]] - -[[!meta title=""]] + +[[!meta title=""]] - -[[!meta permalink=""]] + +[[!meta permalink=""]] - -[[!meta copyright=""]] + +[[!meta copyright=""]] -[[!meta author=""]] -[[!meta authorurl=""]] +[[!meta author=""]] +[[!meta authorurl=""]] diff --git a/archivepage.tmpl b/archivepage.tmpl index 6bc789d..93bdd9c 100644 --- a/archivepage.tmpl +++ b/archivepage.tmpl @@ -1,7 +1,19 @@

+ +
+
+
Posted + +by + + + + + + + -

diff --git a/atomitem.tmpl b/atomitem.tmpl index 1ff7f4f..4ed17bc 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,42 +1,48 @@ <TMPL_VAR TITLE> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + diff --git a/atompage.tmpl b/atompage.tmpl index dcb89ab..e82b598 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -5,32 +5,32 @@ - - + + - + - - - - - - - - - + + + + + - - - - - + - - + - + + + + + + + + + + ikiwiki diff --git a/autotag.tmpl b/autotag.tmpl new file mode 100644 index 0000000..9162e9e --- /dev/null +++ b/autotag.tmpl @@ -0,0 +1,4 @@ +[[!meta title="pages tagged "]] + +[[!inline pages="tagged()" actions="no" archive="yes" +feedshow=10]] diff --git a/blogpost.tmpl b/blogpost.tmpl index 7eeede6..5a31e3f 100644 --- a/blogpost.tmpl +++ b/blogpost.tmpl @@ -1,10 +1,10 @@
- -RSS + +RSS - -Atom + +Atom diff --git a/calendarmonth.tmpl b/calendarmonth.tmpl new file mode 100644 index 0000000..23cd954 --- /dev/null +++ b/calendarmonth.tmpl @@ -0,0 +1,5 @@ +[[!sidebar content=""" +[[!calendar type=month month= year= pages=""]] +"""]] + +[[!inline pages="creation_month() and creation_year() and " show=0 feeds=no reverse=yes]] diff --git a/calendaryear.tmpl b/calendaryear.tmpl new file mode 100644 index 0000000..714bd6d --- /dev/null +++ b/calendaryear.tmpl @@ -0,0 +1 @@ +[[!calendar type=year year= pages=""]] diff --git a/change.tmpl b/change.tmpl index 4a99cf5..671b9e4 100644 --- a/change.tmpl +++ b/change.tmpl @@ -2,12 +2,15 @@ [[!meta authorurl=""""""]] -[[!meta title="""change to on """]] - + + +
diff --git a/commentmoderation.tmpl b/commentmoderation.tmpl new file mode 100644 index 0000000..dfa63c2 --- /dev/null +++ b/commentmoderation.tmpl @@ -0,0 +1,32 @@ + +
+ + + + + + +
+ +
+
+ +
+ + + + + + +
+
+
+ + + + + +

+No comments need moderation at this time. +

+
diff --git a/editcomment.tmpl b/editcomment.tmpl new file mode 100644 index 0000000..a2edc69 --- /dev/null +++ b/editcomment.tmpl @@ -0,0 +1,39 @@ +
+ +
+ + + + + + + + (optional, or signin) +
+ + (optional) +
+ +(You might want to Signin first?) +
+
+
+ +
+ +
+
+ + + + +
+
+Comment preview: +
+
+ +
+
+ +
diff --git a/editpage.tmpl b/editpage.tmpl index 4b54db2..d6ad806 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -1,6 +1,6 @@ -
+
@@ -8,17 +8,18 @@ -Page location: -Page type: + + -
+

+
-Optional comment about this change:
-
+ +
@@ -37,6 +38,7 @@ Optional comment about this change:
+
@@ -47,3 +49,12 @@ Optional comment about this change:
+ +
+
+Diff: +
+
+ +
+
diff --git a/feedlink.tmpl b/feedlink.tmpl index 2963156..be8637f 100644 --- a/feedlink.tmpl +++ b/feedlink.tmpl @@ -1,8 +1,8 @@ diff --git a/googleform.tmpl b/googleform.tmpl index 523cff0..9468e06 100644 --- a/googleform.tmpl +++ b/googleform.tmpl @@ -1,6 +1,8 @@ +
- - + + placeholder="search" />
diff --git a/inlinepage.tmpl b/inlinepage.tmpl index ffcb897..b0b53d0 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -1,43 +1,41 @@ -
+
-
- - +
+ - - + + - + - - +
+ - - -
+ +
-
+
-
+
-
+
Posted - - + + @@ -52,19 +50,23 @@ License:
- -
+ +
-
+
-
+ diff --git a/microblog.tmpl b/microblog.tmpl new file mode 100644 index 0000000..e22d65c --- /dev/null +++ b/microblog.tmpl @@ -0,0 +1,22 @@ +
+ +
+ +
+ +
+ + + + + + + + + + + +— + +
+
diff --git a/misc.tmpl b/misc.tmpl deleted file mode 100644 index 7f65217..0000000 --- a/misc.tmpl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - -<TMPL_VAR TITLE> - - - - - - - - -
- -/ - -
- -
- -
- - - - - diff --git a/openid-selector.tmpl b/openid-selector.tmpl new file mode 100644 index 0000000..0659ee5 --- /dev/null +++ b/openid-selector.tmpl @@ -0,0 +1,43 @@ + + + + + + +
+
+ + + + +
+
+
+
+ + + +
+ +
+
+
+
+ +
+ +
+ +
+ +
diff --git a/page.tmpl b/page.tmpl index f2f9c34..da8c294 100644 --- a/page.tmpl +++ b/page.tmpl @@ -1,100 +1,167 @@ - + + +
- + + + + + + + <TMPL_VAR TITLE> - + + + + - + + - - + + + - - -
+
+ +
+
+ + +
+ + + + +
Comments on this page are closed.
+
+
+
- + + + + + diff --git a/pocreatepage.tmpl b/pocreatepage.tmpl new file mode 100644 index 0000000..f22ee50 --- /dev/null +++ b/pocreatepage.tmpl @@ -0,0 +1,3 @@ +

+WARNING this page must be written in . +

diff --git a/renamesummary.tmpl b/renamesummary.tmpl index 60f81b3..7a8dc92 100644 --- a/renamesummary.tmpl +++ b/renamesummary.tmpl @@ -11,14 +11,14 @@ The following pages have been automatically modified to update their links to :
    -
  • +
The following pages still link to :
    -
  • +
diff --git a/rssitem.tmpl b/rssitem.tmpl index 42936a6..a64a4eb 100644 --- a/rssitem.tmpl +++ b/rssitem.tmpl @@ -1,26 +1,29 @@ - + <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> - + <TMPL_VAR TITLE> - - - - - - + + + + + + - - + + - - + + - + - + - + + + + diff --git a/searchform.tmpl b/searchform.tmpl index afae2eb..cb65d12 100644 --- a/searchform.tmpl +++ b/searchform.tmpl @@ -1,5 +1,6 @@
- +placeholder="search" />
diff --git a/searchquery.tmpl b/searchquery.tmpl index 782b12c..5b9fbbf 100644 --- a/searchquery.tmpl +++ b/searchquery.tmpl @@ -33,7 +33,7 @@ $def{NEXT,$if{$ne{$last,$msize},}}
-
+
$env{HELPLINK} @@ -54,7 +54,7 @@ $if{$not{$msizeexact}, $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} of exactly $nice{$msize} matches} }
-
+ $list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},,/,}: $nice{$freq{$_}}},Term frequencies: ,$. ,}
Search took $time seconds @@ -77,8 +77,9 @@ $percentage% relevant$. matching: $list{$map{$terms,$html{$prettyterm{$_}}},$. , and }${for lynx:}

}

-
+
+
${suppress next, prev, and page links if there's only one page} $if{$ne{$lastpage,1}, $set{a,$if{$opt{pagelink_height}, HEIGHT=$opt{pagelink_height}}$if{$opt{pagelink_width}, WIDTH=$opt{pagelink_width}}} @@ -97,7 +98,7 @@ $if{$ne{$opt{y},$lastpage},...} $NEXT } }} -

+
$if{$dbname,} $if{$ne{$topdoc,0},} $if{$ne{$hitsperpage,10},} diff --git a/titlepage.tmpl b/titlepage.tmpl index f5cd5bc..6326bab 100644 --- a/titlepage.tmpl +++ b/titlepage.tmpl @@ -1 +1,7 @@ -

+

+ + + + + +

-- cgit v1.2.3 From ee62a82c4be0125da6b4758e43e231a3c28c857f Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 19 Jul 2010 15:27:52 +0200 Subject: Apply gettext translation. --- archivepage.tmpl | 4 ++-- atomitem.tmpl | 6 +++--- atompage.tmpl | 2 +- autotag.tmpl | 2 +- change.tmpl | 10 +++++----- comment.tmpl | 12 ++++++------ commentmoderation.tmpl | 12 ++++++------ editcomment.tmpl | 16 ++++++++-------- editconflict.tmpl | 6 +++--- editcreationconflict.tmpl | 10 +++++----- editfailedsave.tmpl | 6 +++--- editpage.tmpl | 10 +++++----- editpagegone.tmpl | 6 +++--- googleform.tmpl | 2 +- inlinepage.tmpl | 8 ++++---- openid-selector.tmpl | 6 +++--- page.tmpl | 26 +++++++++++++------------- passwordmail.tmpl | 15 ++++++++------- pocreatepage.tmpl | 2 +- renamesummary.tmpl | 8 ++++---- searchform.tmpl | 2 +- searchquery.tmpl | 40 ++++++++++++++++++++-------------------- 22 files changed, 106 insertions(+), 105 deletions(-) diff --git a/archivepage.tmpl b/archivepage.tmpl index 93bdd9c..7bd0935 100644 --- a/archivepage.tmpl +++ b/archivepage.tmpl @@ -5,9 +5,9 @@
-Posted +Leveret -by +af diff --git a/atomitem.tmpl b/atomitem.tmpl index 4ed17bc..6bafbd0 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/atompage.tmpl b/atompage.tmpl index e82b598..631ef6d 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -12,7 +12,7 @@ - + diff --git a/autotag.tmpl b/autotag.tmpl index 9162e9e..cf07d26 100644 --- a/autotag.tmpl +++ b/autotag.tmpl @@ -1,4 +1,4 @@ -[[!meta title="pages tagged "]] +[[!meta title="sider med mærkat "]] [[!inline pages="tagged()" actions="no" archive="yes" feedshow=10]] diff --git a/change.tmpl b/change.tmpl index 671b9e4..c0fb60a 100644 --- a/change.tmpl +++ b/change.tmpl @@ -2,12 +2,12 @@ [[!meta authorurl=""""""]] -[[!meta title="""change to on """]] +[[!meta title="""ændring af """]] [[!meta permalink=""]]
diff --git a/comment.tmpl b/comment.tmpl index c2ee5a3..7d22ec0 100644 --- a/comment.tmpl +++ b/comment.tmpl @@ -15,13 +15,13 @@
-Comment by +Kommentar fra - + @@ -31,11 +31,11 @@ Comment by -Comment by +Kommentar fra - + - + @@ -52,7 +52,7 @@ Comment by
diff --git a/commentmoderation.tmpl b/commentmoderation.tmpl index dfa63c2..b71db3a 100644 --- a/commentmoderation.tmpl +++ b/commentmoderation.tmpl @@ -5,7 +5,7 @@ - +
@@ -13,20 +13,20 @@
- + - + - +

- +

-No comments need moderation at this time. +Ingen kommentarer kræver tilbageholdelse i øjeblikket.

diff --git a/editcomment.tmpl b/editcomment.tmpl index a2edc69..66e79fc 100644 --- a/editcomment.tmpl +++ b/editcomment.tmpl @@ -7,20 +7,20 @@ - - (optional, or signin) + + (valgfrit, eller registrér)
- - (optional) + + (valgfrit)
-(You might want to Signin first?) +(Måske du vil registrere dig først?)
- +
- +

@@ -29,7 +29,7 @@
-Comment preview: +Kommentar smugkig:
diff --git a/editconflict.tmpl b/editconflict.tmpl index 1252033..10e4b85 100644 --- a/editconflict.tmpl +++ b/editconflict.tmpl @@ -1,7 +1,7 @@

-Your changes conflict with other changes made to the page. +Dine rettelser er i strid med andre retttelser foretaget på siden.

-Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. +Modstridende områder er blevet markeret i sidens indhold. Løs problemet og +aflevér igen for at gemme dine rettelser.

diff --git a/editcreationconflict.tmpl b/editcreationconflict.tmpl index c99102f..7b7e5f3 100644 --- a/editcreationconflict.tmpl +++ b/editcreationconflict.tmpl @@ -1,9 +1,9 @@

-While you were creating this page, someone else independently created a page -with the same name. +Mens du oprettede denne side, har en anden uafhængigt af dig oprettet en side +med det samme navn.

-The edit box below contains the page's current content, followed by the -content you entered previously, to allow you to merge the two -together before saving. +Redigeringsområdet nedenfor indeholder sidens nuværende indhold, efterfulgt af +indholdet du skrev tidligere, så du har mulighed for at slå de to sammen før du +gemmer.

diff --git a/editfailedsave.tmpl b/editfailedsave.tmpl index 5184f7d..320d03a 100644 --- a/editfailedsave.tmpl +++ b/editfailedsave.tmpl @@ -1,10 +1,10 @@

-Failed to save your changes. +Kunne ikke gemme dine rettelser.

-Your changes were not able to be saved to disk. The system gave the error: +Dine rettelser kunne ikke arkiveres til disk. Systemet gav følgende fejlmelding:

-Your changes are preserved below, and you can try again to save them. +Dine rettelser er bevaret nedenfor, og du kan prøve igen at gemme dem.

diff --git a/editpage.tmpl b/editpage.tmpl index d6ad806..00ec9e1 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -8,8 +8,8 @@ - - + + @@ -18,13 +18,13 @@
- +
-Attachments +Vedhæftninger
@@ -43,7 +43,7 @@
-Page preview: +Smugkig:
diff --git a/editpagegone.tmpl b/editpagegone.tmpl index 2eed03a..7530c06 100644 --- a/editpagegone.tmpl +++ b/editpagegone.tmpl @@ -1,7 +1,7 @@

-The page you were editing has disappeared. +Siden du redigerede er forsvundet.

-Perhaps someone else has deleted it or moved it. If you want to recreate -this page with your text, click "Save Page" again. +Måske har nogen slettet den eller flyttet den. Hvis du vil gendanne denne +side med din tekst, så vælg "Gem side" igen.

diff --git a/googleform.tmpl b/googleform.tmpl index 9468e06..561bf5c 100644 --- a/googleform.tmpl +++ b/googleform.tmpl @@ -3,6 +3,6 @@
placeholder="search" /> + placeholder="søg" />
diff --git a/inlinepage.tmpl b/inlinepage.tmpl index b0b53d0..5380316 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -26,12 +26,12 @@
-Posted +Leveret
@@ -139,7 +139,7 @@
diff --git a/passwordmail.tmpl b/passwordmail.tmpl index aa8a68c..fcdb1e6 100644 --- a/passwordmail.tmpl +++ b/passwordmail.tmpl @@ -1,15 +1,16 @@ -Someone[1], possibly you, requested that the password for - on [2] be reset. +Nogen[1], muligvis dig, har bedt om at få adgangskoden til + ved [2] nulstillet. -To change your password, visit the following url, and enter a new password: +Skift din adgangskode ved at besøge følgende adresse og angive en ny +adgangskode: -This url can only be used once to change your password, and it will also -stop working the next time you successfully log in. +Denne adresse kan kun benyttes én gang til at skifte din adgangskode, og vil +også holde op med at fungere næste gang du logger korrekt på. -- ikiwiki -[1] Their IP address was -[2] Located at +[1] Deres IP-adresse var +[2] Placeret ved diff --git a/pocreatepage.tmpl b/pocreatepage.tmpl index f22ee50..475dad7 100644 --- a/pocreatepage.tmpl +++ b/pocreatepage.tmpl @@ -1,3 +1,3 @@

-WARNING this page must be written in . +ADVARSEL denne side skal være skrevet i .

diff --git a/renamesummary.tmpl b/renamesummary.tmpl index 7a8dc92..faad5ff 100644 --- a/renamesummary.tmpl +++ b/renamesummary.tmpl @@ -1,22 +1,22 @@

-Failed to rename to : +Omdøbning af til mislykkedes:

-Successfully renamed to . +Successfuldt omdøbt til .

-The following pages have been automatically modified to update their links to : +De følgende sider er blevet automatisk ændret til at opdatere deres henvisninger til :

-The following pages still link to : +De følgende sider henviser fortsat til :
diff --git a/searchform.tmpl b/searchform.tmpl index cb65d12..7ac724f 100644 --- a/searchform.tmpl +++ b/searchform.tmpl @@ -1,6 +1,6 @@
placeholder="search" /> +placeholder="søg" />
diff --git a/searchquery.tmpl b/searchquery.tmpl index 5b9fbbf..7408fa8 100644 --- a/searchquery.tmpl +++ b/searchquery.tmpl @@ -1,6 +1,6 @@ $setmap{prefix,title,S} $setmap{prefix,link,XLINK} -$set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} +$set{thousand,$.}$set{decimal,.}$setmap{BN,,Ethvert land,dk,Danmark,uk,England,fr,Frankrig} ${ $def{PREV, $if{$ne{$topdoc,0},} $def{SPAGE,$if{$gt{$1,9},$if{$gt{$1,99},$S{$1,$div{$1,100}}}$S{$1,$mod{$div{$1,10},10}}}$S{$1,$mod{$1,10}}} } -$def{PREV,$if{$ne{$topdoc,0},}} +$def{PREV,$if{$ne{$topdoc,0},}} $def{PAGE,} -$def{SPAGE,} +$def{SPAGE,} -$def{NEXT,$if{$ne{$last,$msize},}} +$def{NEXT,$if{$ne{$last,$msize},}}

@@ -35,28 +35,28 @@ $def{NEXT,$if{$ne{$last,$msize},}} ACTION="$html{$env{CGIURL}}" TARGET="_top">

- + $env{HELPLINK}
$or{$html{$error}, $if{$eq{$msize,0}, -$if{$query,No documents match your query, -
Searching $nice{$dbsize} documents +$if{$query,Ingen dokumenter modsvarer din forespørgsel, +
Gennemsøgte $nice{$dbsize} dokumenter }, $if{$not{$msizeexact}, - $nice{$add{$topdoc,1}}-$nice{$last} of about $nice{$msize} matches, + $nice{$add{$topdoc,1}}-$nice{$last} ud af omkring $nice{$msize} fundne, $if{$and{$eq{$last,$msize},$eq{$topdoc,0}}, - All $nice{$msize} matches, - $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} of exactly $nice{$msize} matches} + Alle $nice{$msize} fundne, + $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} ud af nøjagtigt $nice{$msize} fundne} }
-$list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},,/,}: $nice{$freq{$_}}},Term frequencies: ,$. ,} -
Search took $time seconds +$list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},,/,}: $nice{$freq{$_}}},Udtryks hyppigheder: ,$. ,} +
Søgning tog $time sekunder
$hitlist{ -} +$percentage% relevant$. fundne: +$list{$map{$terms,$html{$prettyterm{$_}}},$. , og }${for lynx:}

}

${$percentage%} @@ -65,16 +65,16 @@ ${$percentag
 </div></div>
 <div style='float:left;margin-top:2px;font-size:x-small;'>
 <span title= -Modified:
$html{$date{$field{modtime},%Y-%m-%d}}
-$if{$field{language},Language: $html{$field{language}}
} -$if{$field{size},Size: $html{$filesize{$field{size}}}
} +Ændret:
$html{$date{$field{modtime},%Y-%m-%d}}
+$if{$field{language},Sprog: $html{$field{language}}
} +$if{$field{size},Størrelse: $html{$filesize{$field{size}}}
}
$html{$or{$field{caption},$field{title},$field{url},Untitled}}
+
$html{$or{$field{caption},$field{title},$field{url},Uden navn}}
$highlight{$field{sample},$terms}$if{$field{sample},...}
-$percentage% relevant$. matching: -$list{$map{$terms,$html{$prettyterm{$_}}},$. , and }${for lynx:}


-- cgit v1.2.3