This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 7d8043d474b66c156fec3b393319ec8c4149a4b6 (commit)
from 11ab436cf9cb32078ea1447909fcbbbe88a35aa4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7d8043d474b66c156fec3b393319ec8c4149a4b6
Author: Marc-Etienne Vargenau <[email protected]>
Date: Wed Jun 25 18:17:39 2014 +0200
wiki: update translations; better handle fusionforge theme
diff --git a/src/plugins/wiki/www/lib/WikiTheme.php
b/src/plugins/wiki/www/lib/WikiTheme.php
index aa6478e..060eec7 100644
--- a/src/plugins/wiki/www/lib/WikiTheme.php
+++ b/src/plugins/wiki/www/lib/WikiTheme.php
@@ -1915,6 +1915,9 @@ class RelatedExternalLinksBox extends SidebarBox
function listAvailableThemes()
{
+ if (THEME == 'fusionforge') {
+ return array(THEME);
+ }
$available_themes = array();
$dir_root = 'themes';
if (defined('PHPWIKI_DIR'))
@@ -1922,14 +1925,15 @@ function listAvailableThemes()
$dir = dir($dir_root);
if ($dir) {
while ($entry = $dir->read()) {
- if (is_dir($dir_root . '/' . $entry)
- and file_exists($dir_root . '/' . $entry . '/themeinfo.php')
- ) {
+ // 'fusionforge' cannot be selected as standalone theme
+ if (($entry != 'fusionforge') and (is_dir($dir_root . '/' . $entry)
+ and file_exists($dir_root . '/' . $entry . '/themeinfo.php')))
{
array_push($available_themes, $entry);
}
}
$dir->close();
}
+ natcasesort($available_themes);
return $available_themes;
}
@@ -1947,6 +1951,7 @@ function listAvailableLanguages()
}
$dir->close();
}
+ natcasesort($available_languages);
return $available_languages;
}
diff --git a/src/plugins/wiki/www/lib/plugin/SystemInfo.php
b/src/plugins/wiki/www/lib/plugin/SystemInfo.php
index c861385..c01c740 100644
--- a/src/plugins/wiki/www/lib/plugin/SystemInfo.php
+++ b/src/plugins/wiki/www/lib/plugin/SystemInfo.php
@@ -457,7 +457,7 @@ class WikiPlugin_SystemInfo
. implode(', ', $available_languages) . ". "
. _("Current language") . _(": ") . $GLOBALS['LANG']
. ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
- ? ". " . sprintf(_("Default language: “%s”"), DEFAULT_LANGUAGE)
+ ? ". " . _("Default language") . _(": ") . DEFAULT_LANGUAGE
: '');
}
@@ -470,7 +470,7 @@ class WikiPlugin_SystemInfo
. implode(', ', $available_themes) . ". "
. _("Current theme") . _(": ") . $WikiTheme->_name
. ((THEME != $WikiTheme->_name)
- ? ". " . sprintf(_("Default theme: “%s”"), THEME)
+ ? ". " . _("Default theme") . _(": ") . THEME
: '');
}
diff --git a/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.mo
index 27cdd38..2b8d541 100644
Binary files a/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.mo
index b786503..2fa6206 100644
Binary files a/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo
index 3dd0ad6..5591849 100644
Binary files a/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.mo
index 225472c..6b2e458 100644
Binary files a/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo
index c7dcea3..44bb85e 100644
Binary files a/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo
index 6809e4d..de5b9b6 100644
Binary files a/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/po/de.po
b/src/plugins/wiki/www/locale/po/de.po
index bbc9932..79c31f3 100644
--- a/src/plugins/wiki/www/locale/po/de.po
+++ b/src/plugins/wiki/www/locale/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <[email protected]>, Carsten Klapp "
"<[email protected]>, Helmer Pardun <pardunpress@t-online."
@@ -2989,9 +2989,8 @@ msgstr "%d Sprache gesamt: "
msgid "Current language"
msgstr "Ausgewählte Sprache"
-#, php-format
-msgid "Default language: “%s”"
-msgstr "Standardsprache für dieses Wiki: »%s«"
+msgid "Default language"
+msgstr "Standardsprache für dieses Wiki"
#, php-format
msgid "Total of %d themes: "
@@ -3000,9 +2999,8 @@ msgstr "%d Benutzeroberfläche gesamt: "
msgid "Current theme"
msgstr "Ausgewählte Darstellung"
-#, php-format
-msgid "Default theme: “%s”"
-msgstr "Darstellung des Systems: »%s«"
+msgid "Default theme"
+msgstr "Darstellung des Systems"
#, php-format
msgid "unknown argument “%s” to SystemInfo"
@@ -5277,9 +5275,8 @@ msgstr "GuterStil"
msgid "See %s tips for editing."
msgstr "Siehe %s Tips fürs Edieren."
-#, fuzzy
msgid "Help/TextFormattingRules"
-msgstr "TextFormatierungsRegeln"
+msgstr "Hilfe/TextFormatierungsRegeln"
msgid "Synopsis"
msgstr "Übersicht"
@@ -6100,6 +6097,18 @@ msgstr "Sidebar"
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but e d i e r e n).
+#, fuzzy
+#~ msgid "Prediction: %s"
+#~ msgstr "Bearbeite: %s"
+
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but e d i e r e n).
+#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Bearbeite: %s"
+
#~ msgid "invalid %s ignored"
#~ msgstr "ungültiges %s ignoriert"
@@ -6109,12 +6118,6 @@ msgstr "Diese Seite bearbeiten"
#~ msgid "Original (1.2 or 1.0)"
#~ msgstr "Original (1,2 oder 1,0)"
-# (Wrong Translation; sorry, but the German term for edit is NOT
-# editieren, but e d i e r e n).
-#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Bearbeite: %s"
-
#, fuzzy
#~ msgid "%s not found"
#~ msgstr "%s nicht gefunden"
diff --git a/src/plugins/wiki/www/locale/po/es.po
b/src/plugins/wiki/www/locale/po/es.po
index 28a2636..b36bad8 100644
--- a/src/plugins/wiki/www/locale/po/es.po
+++ b/src/plugins/wiki/www/locale/po/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <[email protected]>\n"
"Language-Team: \n"
@@ -2904,8 +2904,7 @@ msgstr ""
msgid "Current language"
msgstr ""
-#, php-format
-msgid "Default language: “%s”"
+msgid "Default language"
msgstr ""
#, php-format
@@ -2915,8 +2914,7 @@ msgstr ""
msgid "Current theme"
msgstr ""
-#, php-format
-msgid "Default theme: “%s”"
+msgid "Default theme"
msgstr ""
#, php-format
@@ -5145,9 +5143,8 @@ msgstr "BuenEstilo"
msgid "See %s tips for editing."
msgstr "%s tips para editar."
-#, fuzzy
msgid "Help/TextFormattingRules"
-msgstr "ReglasDeFormatoDeTexto"
+msgstr "Ayuda/ReglasDeFormatoDeTexto"
msgid "Synopsis"
msgstr "Sinopsis"
@@ -5912,14 +5909,18 @@ msgstr ""
msgid "Edit this page"
msgstr "Corrija esta página"
-#~ msgid "Version %s"
-#~ msgstr "Versión %s"
-
#, fuzzy
#~ msgid "Prediction: %s"
#~ msgstr "Editar: %s"
#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Editar: %s"
+
+#~ msgid "Version %s"
+#~ msgstr "Versión %s"
+
+#, fuzzy
#~ msgid "%s not found"
#~ msgstr "fichero %s no encontrado"
diff --git a/src/plugins/wiki/www/locale/po/fr.po
b/src/plugins/wiki/www/locale/po/fr.po
index 899864d..f072848 100644
--- a/src/plugins/wiki/www/locale/po/fr.po
+++ b/src/plugins/wiki/www/locale/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <[email protected]>, Roland "
"Trique <[email protected]>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1852,7 +1852,7 @@ msgstr ""
msgid "List page names which share an initial or final title word with “%s”."
msgstr ""
"Affiche la liste des pages qui partagent un mot initial ou final dans leur "
-"titre avec %s."
+"titre avec « %s »."
#, php-format
msgid "Page names with prefix “%s”"
@@ -2222,11 +2222,11 @@ msgstr ""
#, php-format
msgid "Unable to find src=“%s”"
-msgstr "Impossible de trouver src=%s"
+msgstr "Impossible de trouver src=« %s »"
#, php-format
msgid "Unable to read src=“%s”"
-msgstr "Impossible de lire src=%s"
+msgstr "Impossible de lire src=« %s »"
msgid "PHP syntax highlighting."
msgstr "Coloration syntaxique du PHP."
@@ -2923,14 +2923,13 @@ msgstr "%d greffons au total : "
#, php-format
msgid "Total of %d languages: "
-msgstr "%d langages au total : "
+msgstr "%d langues au total : "
msgid "Current language"
msgstr "Ma langue"
-#, php-format
-msgid "Default language: “%s”"
-msgstr "Langue par défaut : « %s »"
+msgid "Default language"
+msgstr "Langue par défaut"
#, php-format
msgid "Total of %d themes: "
@@ -2939,9 +2938,8 @@ msgstr "%d thèmes au total: "
msgid "Current theme"
msgstr "Mon thème"
-#, php-format
-msgid "Default theme: “%s”"
-msgstr "Thème par défaut : « %s »"
+msgid "Default theme"
+msgstr "Thème par défaut"
#, php-format
msgid "unknown argument “%s” to SystemInfo"
@@ -2960,22 +2958,22 @@ msgid "Cache statistics"
msgstr "Statistiques de cache"
msgid "Page statistics"
-msgstr "Statistiques de page"
+msgstr "Statistiques de pages"
msgid "User statistics"
-msgstr "Statistiques d'utilisateur"
+msgstr "Statistiques d'utilisateurs"
msgid "Hit statistics"
msgstr "Statistiques de visites"
msgid "Harddisc usage"
-msgstr ""
+msgstr "Utilisation du disque"
msgid "Expiry parameters"
-msgstr "Expiration des paramètres"
+msgstr "Paramètres d'expiration"
msgid "Wikiname regexp"
-msgstr "regexp du WikiNom"
+msgstr "Expression rationnelle du WikiNom"
msgid "Allowed protocols"
msgstr "Protocoles autorisés"
@@ -2987,7 +2985,7 @@ msgid "Available plugins"
msgstr "Greffons disponibles"
msgid "Supported languages"
-msgstr "Langages supportés"
+msgstr "Langues supportées"
msgid "Supported themes"
msgstr "Thèmes supportés"
@@ -3090,7 +3088,7 @@ msgstr "TraductionsContribuées"
#, php-format
msgid "Translate “%s” to “%s” in *%s*"
-msgstr "Traduire de “%s” à “%s” en *%s*"
+msgstr "Traduire de « %s » à « %s » en *%s*"
#, php-format
msgid "Translate %s to %s in %s"
@@ -3145,7 +3143,7 @@ msgstr "ACCÈS REFUSÉ : Vous devez être connecté pour
télécharger."
#, php-format
msgid "Error uploading “%s”"
-msgstr "ERREUR en déposant « %s »"
+msgstr "Erreur en déposant « %s »"
#, php-format
msgid "Files with extension %s are not allowed."
@@ -3651,15 +3649,15 @@ msgstr "ACL inchangée pour la page « %s »."
#, php-format
msgid "ACL changed for page “%s”"
-msgstr "ACL modifiée pour la page « %s »."
+msgstr "ACL modifiée pour la page « %s »"
#, php-format
msgid "to “%s”."
-msgstr ""
+msgstr "à « %s »."
#, php-format
msgid "ACL changed for page “%s” from “%s” to “%s”."
-msgstr ""
+msgstr "ACL modifiée pour la page « %s » de « %s » à « %s »."
msgid "Invalid ACL"
msgstr "ACL invalide"
@@ -5196,9 +5194,8 @@ msgstr "StyleCorrect"
msgid "See %s tips for editing."
msgstr "Voir les conseils pour éditer les pages dans %s."
-#, fuzzy
msgid "Help/TextFormattingRules"
-msgstr "RèglesDeFormatageDesTextes"
+msgstr "Aide/RèglesDeFormatageDesTextes"
msgid "Synopsis"
msgstr "Vue d'ensemble"
@@ -5996,6 +5993,12 @@ msgstr ""
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid "Prediction: %s"
+#~ msgstr "Prédiction : %s"
+
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Prédiction : %.1f"
+
#~ msgid "invalid %s ignored"
#~ msgstr "%s non valable ignoré"
@@ -6005,12 +6008,6 @@ msgstr "Modifier cette page"
#~ msgid "Version %s"
#~ msgstr "Version %s"
-#~ msgid "Prediction: %s"
-#~ msgstr "Prédiction : %s"
-
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Prédiction : %.1f"
-
#, fuzzy
#~ msgid "%s not found"
#~ msgstr "%s non trouvé dans %s"
diff --git a/src/plugins/wiki/www/locale/po/it.po
b/src/plugins/wiki/www/locale/po/it.po
index a1400bf..0362bdc 100644
--- a/src/plugins/wiki/www/locale/po/it.po
+++ b/src/plugins/wiki/www/locale/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -2877,8 +2877,7 @@ msgstr ""
msgid "Current language"
msgstr ""
-#, php-format
-msgid "Default language: “%s”"
+msgid "Default language"
msgstr ""
#, php-format
@@ -2888,8 +2887,7 @@ msgstr ""
msgid "Current theme"
msgstr ""
-#, php-format
-msgid "Default theme: “%s”"
+msgid "Default theme"
msgstr ""
#, php-format
@@ -5081,9 +5079,8 @@ msgstr "BuonStile"
msgid "See %s tips for editing."
msgstr "Vedere %s consigli per le modifiche."
-#, fuzzy
msgid "Help/TextFormattingRules"
-msgstr "RegoleFormattazioneTesto"
+msgstr "Aiuto/RegoleFormattazioneTesto"
msgid "Synopsis"
msgstr "Sommario"
@@ -5847,6 +5844,14 @@ msgstr ""
msgid "Edit this page"
msgstr ""
+#, fuzzy
+#~ msgid "Prediction: %s"
+#~ msgstr "Modifica: %s"
+
+#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Modifica: %s"
+
#~ msgid "_PreferencesInfo"
#~ msgstr "_PreferenzeInfo"
@@ -5854,10 +5859,6 @@ msgstr ""
#~ msgstr "Versione %s"
#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Modifica: %s"
-
-#, fuzzy
#~ msgid "%s not found"
#~ msgstr "file %s non trovato"
diff --git a/src/plugins/wiki/www/locale/po/ja.po
b/src/plugins/wiki/www/locale/po/ja.po
index 5f33acc..baa2bb1 100644
--- a/src/plugins/wiki/www/locale/po/ja.po
+++ b/src/plugins/wiki/www/locale/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2927,8 +2927,7 @@ msgstr ""
msgid "Current language"
msgstr "現在の言語"
-#, php-format
-msgid "Default language: “%s”"
+msgid "Default language"
msgstr ""
#, php-format
@@ -2938,9 +2937,8 @@ msgstr "総テーマ数: %d"
msgid "Current theme"
msgstr "現在のテーマ"
-#, php-format
-msgid "Default theme: “%s”"
-msgstr "デフォルトテーマ: %s"
+msgid "Default theme"
+msgstr "デフォルトテーマ"
#, php-format
msgid "unknown argument “%s” to SystemInfo"
@@ -6093,6 +6091,14 @@ msgstr "スライドバー"
msgid "Edit this page"
msgstr "ページを編集しています。"
+#, fuzzy
+#~ msgid "Prediction: %s"
+#~ msgstr "編集: %s"
+
+#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "編集: %s"
+
#~ msgid "Use old markup"
#~ msgstr "古いマークアップを使用"
@@ -6144,14 +6150,6 @@ msgstr "ページを編集しています。"
#~ msgstr "バージョン %s"
#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "編集: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "編集: %s"
-
-#, fuzzy
#~ msgid "%s not found"
#~ msgstr "%s: ファイルが見つかりません。"
diff --git a/src/plugins/wiki/www/locale/po/nl.po
b/src/plugins/wiki/www/locale/po/nl.po
index 1904b60..723d787 100644
--- a/src/plugins/wiki/www/locale/po/nl.po
+++ b/src/plugins/wiki/www/locale/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -2868,8 +2868,7 @@ msgstr ""
msgid "Current language"
msgstr ""
-#, php-format
-msgid "Default language: “%s”"
+msgid "Default language"
msgstr ""
#, php-format
@@ -2879,8 +2878,7 @@ msgstr ""
msgid "Current theme"
msgstr ""
-#, php-format
-msgid "Default theme: “%s”"
+msgid "Default theme"
msgstr ""
#, php-format
@@ -5072,9 +5070,8 @@ msgstr "GoedeStijl"
msgid "See %s tips for editing."
msgstr "%s tips for veranderen."
-#, fuzzy
msgid "Help/TextFormattingRules"
-msgstr "TekstFormatteringsRegels"
+msgstr "Help/TekstFormatteringsRegels"
msgid "Synopsis"
msgstr ""
@@ -5843,6 +5840,10 @@ msgstr ""
#~ msgstr "Verander: %s"
#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Verander: %s"
+
+#, fuzzy
#~ msgid "period"
#~ msgstr "versie %d"
diff --git a/src/plugins/wiki/www/locale/po/phpwiki.pot
b/src/plugins/wiki/www/locale/po/phpwiki.pot
index 12d739a..9687307 100644
--- a/src/plugins/wiki/www/locale/po/phpwiki.pot
+++ b/src/plugins/wiki/www/locale/po/phpwiki.pot
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2862,8 +2862,7 @@ msgstr ""
msgid "Current language"
msgstr ""
-#, php-format
-msgid "Default language: “%s”"
+msgid "Default language"
msgstr ""
#, php-format
@@ -2873,8 +2872,7 @@ msgstr ""
msgid "Current theme"
msgstr ""
-#, php-format
-msgid "Default theme: “%s”"
+msgid "Default theme"
msgstr ""
#, php-format
diff --git a/src/plugins/wiki/www/locale/po/sv.po
b/src/plugins/wiki/www/locale/po/sv.po
index aaea2d8..ff165be 100644
--- a/src/plugins/wiki/www/locale/po/sv.po
+++ b/src/plugins/wiki/www/locale/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <[email protected]>\n"
"Language-Team: \n"
@@ -2863,8 +2863,7 @@ msgstr ""
msgid "Current language"
msgstr ""
-#, php-format
-msgid "Default language: “%s”"
+msgid "Default language"
msgstr ""
#, php-format
@@ -2874,8 +2873,7 @@ msgstr ""
msgid "Current theme"
msgstr ""
-#, php-format
-msgid "Default theme: “%s”"
+msgid "Default theme"
msgstr ""
#, php-format
@@ -5065,9 +5063,8 @@ msgstr "BraStil"
msgid "See %s tips for editing."
msgstr "%s: Redigeringstips."
-#, fuzzy
msgid "Help/TextFormattingRules"
-msgstr "Textformateringsregler"
+msgstr "Hjälp/Textformateringsregler"
msgid "Synopsis"
msgstr "Översikt"
@@ -5836,6 +5833,10 @@ msgstr ""
#~ msgstr "Redigera: %s"
#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Redigera: %s"
+
+#, fuzzy
#~ msgid "%s not found"
#~ msgstr "%s: fila ingen funna"
diff --git a/src/plugins/wiki/www/locale/po/zh.po
b/src/plugins/wiki/www/locale/po/zh.po
index c2679eb..37154d0 100644
--- a/src/plugins/wiki/www/locale/po/zh.po
+++ b/src/plugins/wiki/www/locale/po/zh.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 18:33+0200\n"
+"POT-Creation-Date: 2014-06-25 18:08+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <[email protected]>\n"
"Language-Team: DruryL <[email protected]>\n"
@@ -70,7 +70,7 @@ msgstr "無"
#, fuzzy, php-format
msgid "Page “%s” does not exist."
-msgstr "群組 %s 不存在"
+msgstr "群組 %s 不存在."
#, php-format
msgid "Diff: %s"
@@ -201,7 +201,7 @@ msgstr "已存於: %s"
#, fuzzy
msgid "Too many external links."
-msgstr "外部連結"
+msgstr "外部連結."
msgid "SpamAssassin reports: "
msgstr ""
@@ -476,7 +476,7 @@ msgstr "佈景主題"
#, php-format
msgid "%s: error while handling error:"
-msgstr "%s: 處理錯誤時發生錯誤"
+msgstr "%s: 處理錯誤時發生錯誤:"
#, php-format
msgid "%s: file not found"
@@ -546,7 +546,7 @@ msgid "PageChange Notification Error: Couldn't send %s to
%s"
msgstr "PageChange 通知錯誤: 無法送 %s 給 %s"
msgid "Complete."
-msgstr "完成"
+msgstr "完成."
#, php-format
msgid "Return to %s"
@@ -577,7 +577,7 @@ msgid "Dumping Pages"
msgstr "傾印頁面中"
msgid "Skipped."
-msgstr "跳過"
+msgstr "跳過."
#, php-format
msgid "saved as %s"
@@ -704,7 +704,7 @@ msgstr "預設 InterWiki map 檔案未能載入."
#, php-format
msgid "Loading InterWikiMap from external file %s."
-msgstr "從外部檔案 %s 載入 InterWikiMap"
+msgstr "從外部檔案 %s 載入 InterWikiMap."
msgid "Skipping"
msgstr "跳過"
@@ -825,7 +825,7 @@ msgstr "認證為 %s"
#, fuzzy
msgid "Missing PagePermission:"
-msgstr "個別頁面權限"
+msgstr "個別頁面權限:"
#, fuzzy, php-format
msgid "%s %s %s is disallowed on this wiki for %s user “%s” (level: %s)."
@@ -1207,7 +1207,7 @@ msgstr "InterWiki 位址"
#, fuzzy, php-format
msgid "Show and add comments for %s."
-msgstr "顯示並對 %s 發表意見"
+msgstr "顯示並對 %s 發表意見."
#, php-format
msgid "A required argument “%s” is missing."
@@ -1255,7 +1255,7 @@ msgstr "經過時間: %s s"
#, fuzzy
msgid "List all once authenticated users."
-msgstr "已認證的使用者"
+msgstr "已認證的使用者."
#, php-format
msgid "Authenticated users on this wiki (%d total):"
@@ -1368,9 +1368,8 @@ msgstr ""
msgid "Render inline ASCII SVG."
msgstr ""
-#, fuzzy
msgid "Atom Aggregator Plugin."
-msgstr "簡單的 RSS Feed aggregator Plugin"
+msgstr ""
#, php-format
msgid ""
@@ -1494,7 +1493,7 @@ msgid "Wk"
msgstr "寬"
msgid "Create a Wiki Category Page."
-msgstr "建立 Wiki Category 頁面"
+msgstr "建立 Wiki Category 頁面."
msgid "Render SVG charts."
msgstr ""
@@ -1601,18 +1600,18 @@ msgstr "為 page “%s” 設定 acl."
#, fuzzy
msgid "Display differences between revisions."
-msgstr "顯示修訂間的差異"
+msgstr "顯示修訂間的差異."
#, fuzzy
msgid "Content of versions "
-msgstr "版本 %d"
+msgstr "版本 "
msgid " and "
msgstr ""
#, fuzzy
msgid " is identical."
-msgstr "版本相同"
+msgstr "版本相同."
#, fuzzy
msgid "Version "
@@ -2636,9 +2635,8 @@ msgstr ""
msgid "All modifications"
msgstr "Email 驗證."
-#, fuzzy
msgid "Page once only"
-msgstr "內容"
+msgstr ""
msgid "Full changes"
msgstr ""
@@ -3017,9 +3015,8 @@ msgstr "共有 %d 種語言:"
msgid "Current language"
msgstr "目前語言"
-#, php-format
-msgid "Default language: “%s”"
-msgstr "預設語言: “%s”"
+msgid "Default language"
+msgstr "預設語言"
#, php-format
msgid "Total of %d themes: "
@@ -3028,9 +3025,8 @@ msgstr "共有 %d 組佈景主題: "
msgid "Current theme"
msgstr "目前佈景主題"
-#, php-format
-msgid "Default theme: “%s”"
-msgstr "預設佈景主題: “%s”"
+msgid "Default theme"
+msgstr "預設佈景主題"
#, php-format
msgid "unknown argument “%s” to SystemInfo"
@@ -3532,7 +3528,7 @@ msgstr "選擇頁面以進行更名:"
#, fuzzy
msgid "Selected Pages: "
-msgstr "選擇頁面"
+msgstr "選擇頁面: "
#, fuzzy
msgid "Permanently purge all selected pages."
@@ -3546,13 +3542,12 @@ msgstr "成功地移除頁面 “%s”."
msgid "Didn't purge page “%s”. Access denied."
msgstr "成功地移除頁面 “%s”."
-#, fuzzy
msgid "One page has been permanently purged:"
-msgstr "%s pages 已經永久更名了."
+msgstr ""
#, fuzzy, php-format
msgid "%d pages have been permanently purged:"
-msgstr "%s pages 已經永久更名了."
+msgstr "%d pages 已經永久更名了:"
#, fuzzy
msgid "No pages purged."
@@ -3642,17 +3637,16 @@ msgstr "更名已選定的頁面"
msgid "Select the pages to rename:"
msgstr "選擇頁面以進行更名:"
-#, fuzzy
msgid "Cannot rename. New page name too long."
-msgstr "頁面名稱以 “%s” 開頭的"
+msgstr ""
#, fuzzy, php-format
msgid "Page “%s” already exists. Ignored."
-msgstr "%s 已經存在"
+msgstr "%s 已經存在."
-#, fuzzy, php-format
+#, php-format
msgid "Access denied to rename page “%s”."
-msgstr "為 page “%s” 設定 acl."
+msgstr ""
#, fuzzy, php-format
msgid "Renamed page from “%s” to “%s”."
@@ -3828,7 +3822,7 @@ msgstr "選擇頁面以進行搜尋:"
#, fuzzy
msgid "Miscellaneous utility functions for the Administrator."
-msgstr "給管理者使用的各種公用函數"
+msgstr "給管理者使用的各種公用函數."
#, php-format
msgid "Bad action requested: %s"
@@ -3881,9 +3875,9 @@ msgstr ""
msgid "No empty, unreferenced pages were found."
msgstr "找不到錯誤名稱的頁面."
-#, fuzzy, php-format
+#, php-format
msgid "Deleted %d unreferenced pages:"
-msgstr "找不到錯誤名稱的頁面."
+msgstr ""
#, php-format
msgid ""
@@ -4162,9 +4156,8 @@ msgstr ""
msgid "HomePageAlias"
msgstr ""
-#, fuzzy
msgid "HtmlConverter"
-msgstr "內容"
+msgstr ""
msgid "IncludePage"
msgstr "含括頁面"
@@ -4771,7 +4764,7 @@ msgstr "資料庫"
#, fuzzy
msgid "Backend type: "
-msgstr "錯誤的檔案型態: %s"
+msgstr "錯誤的檔案型態: "
#, fuzzy, php-format
msgid "Check for table %s"
@@ -4841,7 +4834,7 @@ msgstr ""
#, fuzzy
msgid "DB admin password:"
-msgstr "改變密碼"
+msgstr "改變密碼:"
msgid "Check for extra page.cached_html column"
msgstr ""
@@ -5040,7 +5033,7 @@ msgstr "Plugin %s 關閉."
#, fuzzy, php-format
msgid "Plugin “%s” does not exist."
-msgstr "群組 %s 不存在"
+msgstr "群組 %s 不存在."
#, php-format
msgid "%s: no such class"
@@ -5048,7 +5041,7 @@ msgstr "%s: 無此類別"
#, fuzzy, php-format
msgid "%s: not a subclass of WikiPlugin."
-msgstr "%s: 不是 WikiPlugin 的子類別"
+msgstr "%s: 不是 WikiPlugin 的子類別."
#, fuzzy
msgid "Never edited"
@@ -5164,17 +5157,16 @@ msgstr ""
msgid "Could not search in LDAP"
msgstr ""
-#, fuzzy
msgid "User not found in LDAP"
-msgstr "%s 找不到."
+msgstr ""
#, fuzzy
msgid "Wrong password: "
-msgstr "錯誤的密碼.再試一次."
+msgstr "錯誤的密碼.再試一次: "
#, fuzzy, php-format
msgid "Could not connect to LDAP host %s"
-msgstr "無法為頁面 “%s” 變更權限為 “%s”."
+msgstr "無法為頁面 “%s” 變更權限為 “%s”"
#, fuzzy, php-format
msgid "Invalid username “%s” for LDAP Auth"
@@ -5250,13 +5242,11 @@ msgstr ""
#, fuzzy, php-format
msgid "You stored an empty password in your “%s” page."
-msgstr ""
-"\n"
-" 你在你的 “%s” 儲存了空白密碼.\n"
+msgstr " 你在你的 “%s” 儲存了空白密碼."
#, fuzzy, php-format
msgid "Your access permissions are only for a BogoUser."
-msgstr "你的存取權限只能給 BogoUser. \n"
+msgstr "你的存取權限只能給 BogoUser."
#, fuzzy, php-format
msgid "Please set a password in UserPreferences."
@@ -5402,7 +5392,7 @@ msgstr "你正在查看此頁面的較舊修訂."
#, fuzzy
msgid "View the current version."
-msgstr "查看目前版本"
+msgstr "查看目前版本."
#, php-format
msgid "Page Execution took %s seconds"
@@ -5434,9 +5424,9 @@ msgstr "此頁面已經被管理者鎖定,並且無法編輯."
msgid "Comment modified on %s by %s"
msgstr "意見在 %s 被 %s 變更"
-#, fuzzy, php-format
+#, php-format
msgid "Comments on %s by %s."
-msgstr "%s 的意見:"
+msgstr ""
#, fuzzy
msgid "Lock"
@@ -5492,7 +5482,7 @@ msgstr "調整"
#, fuzzy
msgid "Page Content: "
-msgstr "內容"
+msgstr "內容: "
msgid "This is a minor change."
msgstr "這是次要變更."
@@ -5570,7 +5560,7 @@ msgstr "(你的偏好設定已經存放並隱藏在此頁面中.)"
#, php-format
msgid "The %s subpage enables simple weblogging."
-msgstr "%s 子頁面啟動簡易 weblogging"
+msgstr "%s 子頁面啟動簡易 weblogging."
msgid "1 word"
msgstr "1 個單字"
@@ -5681,7 +5671,7 @@ msgstr "共有 %d 位已註冊的使用者."
#, fuzzy, php-format
msgid "The newest registered user is %s."
-msgstr "最近註冊的使用者是 %s"
+msgstr "最近註冊的使用者是 %s."
#, fuzzy, php-format
msgid ""
@@ -5915,9 +5905,9 @@ msgstr "更新偏好設定"
msgid "Reset Preferences"
msgstr ""
-#, fuzzy, php-format
+#, php-format
msgid "Entry on %s by %s."
-msgstr "%s 的意見:"
+msgstr ""
msgid "New Topic"
msgstr ""
@@ -6035,7 +6025,7 @@ msgstr ""
#, fuzzy
msgid "Check menu items to display."
-msgstr "點擊以顯示"
+msgstr "點擊以顯示."
msgid "Left Menu"
msgstr ""
@@ -6116,7 +6106,7 @@ msgstr ""
#, fuzzy
msgid "Search:"
-msgstr "搜尋"
+msgstr "搜尋:"
msgid "Toolbox"
msgstr ""
@@ -6210,6 +6200,14 @@ msgstr "搜尋"
msgid "Edit this page"
msgstr "編輯此頁面"
+#, fuzzy
+#~ msgid "Prediction: %s"
+#~ msgstr "編輯: %s"
+
+#, fuzzy
+#~ msgid "Prediction: %.1f"
+#~ msgstr "編輯: %s"
+
#~ msgid "Use old markup"
#~ msgstr "使用舊標記"
@@ -6260,14 +6258,6 @@ msgstr "編輯此頁面"
#~ msgstr "原始 (1.2 或 1.0)"
#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "編輯: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "編輯: %s"
-
-#, fuzzy
#~ msgid "%s not found"
#~ msgstr "%s 找不到."
diff --git a/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo
index 5ba0d05..654b34d 100644
Binary files a/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo
b/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo
index 61d57b9..6ec603b 100644
Binary files a/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo and
b/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo differ
diff --git a/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl
b/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl
index 475e48e..8c864a2 100644
--- a/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl
+++ b/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl
@@ -65,20 +65,16 @@ $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
if ($isForm) {
$SelectOptions = HTML();
if (!empty($available_themes) and is_array($available_themes)) {
- sort(&$available_themes);
if (!$pref->get('theme') or $pref->get('theme') == THEME) {
$SelectOptions->pushContent(selectedOption("",_("<system
theme>")));
} else {
$SelectOptions->pushContent(unselectedOption("",_("<system
theme>")));
}
foreach ($available_themes as $theme) {
- // 'fusionforge' cannot be selected as standalone theme
- if ($theme != 'fusionforge') {
- if ($theme == $pref->get('theme') and $theme != THEME) {
- $SelectOptions->pushContent(selectedOption($theme));
- } else {
- $SelectOptions->pushContent(unselectedOption($theme));
- }
+ if ($theme == $pref->get('theme') and $theme != THEME) {
+ $SelectOptions->pushContent(selectedOption($theme));
+ } else {
+ $SelectOptions->pushContent(unselectedOption($theme));
}
}
$SelectThemes = HTML::select(array('name' => "pref[theme]",'id' =>
'theme'),
@@ -88,7 +84,6 @@ if ($isForm) {
$SelectOptions = HTML();
if (!empty($available_languages) and is_array($available_languages)) {
- sort(&$available_languages);
if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
$SelectOptions->pushContent(selectedOption("",_("<system
language>")));
} else {
-----------------------------------------------------------------------
Summary of changes:
src/plugins/wiki/www/lib/WikiTheme.php | 11 +-
src/plugins/wiki/www/lib/plugin/SystemInfo.php | 4 +-
.../wiki/www/locale/de/LC_MESSAGES/phpwiki.mo | Bin 102099 -> 102134
bytes
.../wiki/www/locale/es/LC_MESSAGES/phpwiki.mo | Bin 43082 -> 43152 bytes
.../wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo | Bin 109719 -> 110012
bytes
.../wiki/www/locale/it/LC_MESSAGES/phpwiki.mo | Bin 17655 -> 17727 bytes
.../wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo | Bin 13882 -> 13868 bytes
.../wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo | Bin 8466 -> 8537 bytes
src/plugins/wiki/www/locale/po/de.po | 33 ++---
src/plugins/wiki/www/locale/po/es.po | 21 ++--
src/plugins/wiki/www/locale/po/fr.po | 57 +++++----
src/plugins/wiki/www/locale/po/it.po | 23 ++--
src/plugins/wiki/www/locale/po/ja.po | 26 ++--
src/plugins/wiki/www/locale/po/nl.po | 15 +--
src/plugins/wiki/www/locale/po/phpwiki.pot | 8 +-
src/plugins/wiki/www/locale/po/sv.po | 15 +--
src/plugins/wiki/www/locale/po/zh.po | 126 +++++++++-----------
.../wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo | Bin 8236 -> 8307 bytes
.../wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo | Bin 48684 -> 48650 bytes
.../www/themes/default/templates/userprefs.tmpl | 13 +-
20 files changed, 171 insertions(+), 181 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
