summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (sync with submodule HEADs): templates
2010-07-19Merge branch 'master' into _multilangJonas Smedegaard
2010-07-19Sync submodules basewiki directives and templates.Jonas Smedegaard
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (suppress new changes): basewiki_nonedit templates_nonedit
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone, and submodules javascript and openid-selector with HEAD of master): basewiki
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone): basewiki
2010-07-19Add localized submodules of javascript and openid-selector.Jonas Smedegaard
2010-07-19Sync submodule basewiki with HEAD of allinone.Jonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (sync submodules basewiki, basewiki_nonedit and templates_nonedit with HEAD of *_nb branch): basewiki
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (use HEAD of submodule allinone-da): basewiki
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-07-19Merge branch 'wian' into allinone-daJonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
2010-07-19Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into _nbJonas Smedegaard
2010-07-19Merge branch 'master' into _daJonas Smedegaard
2010-07-19Merge branch 'master' into wianJonas Smedegaard
2010-07-19Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into _scsJonas Smedegaard
2010-07-19Merge branch 'master' into _cleanJonas Smedegaard
2010-07-19Improve grammar (OpenID is common gender, not neuter; wikipedia link on url) ↵Jonas Smedegaard
in danish po of basewiki and templates.
2010-07-18Improve grammar in danish po of basewiki and templates: ↵Jonas Smedegaard
signin=registrér/notér (not log på).
2010-07-18Fix a grammar error in danish po of templates.Jonas Smedegaard
2010-07-18Refresh (i.e. drop po line-wrapping of) danish po of templates.Jonas Smedegaard
2010-07-18Fix a couple of grammar errors in danish po of templates.Jonas Smedegaard
2010-07-17Update danish PO of smiley.Jonas Smedegaard