aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/console/command/user
diff options
context:
space:
mode:
authorWolfsblvt <wolfsblvt@gmx.de>2015-04-27 02:27:29 +0200
committerWolfsblvt <wolfsblvt@gmx.de>2015-04-27 02:27:29 +0200
commit55a3d887930bb2b53b067d2807f7d5106f228bec (patch)
tree2930557c9d4055040be656675e4e78607666ce04 /phpBB/phpbb/console/command/user
parent59a178f3cba87f536826df251120f03980a556c6 (diff)
downloadforums-55a3d887930bb2b53b067d2807f7d5106f228bec.tar
forums-55a3d887930bb2b53b067d2807f7d5106f228bec.tar.gz
forums-55a3d887930bb2b53b067d2807f7d5106f228bec.tar.bz2
forums-55a3d887930bb2b53b067d2807f7d5106f228bec.tar.xz
forums-55a3d887930bb2b53b067d2807f7d5106f228bec.zip
[ticket/13787] Remove duplicate entry of poll_delete in prosilver template
When options are shown and poll delete is allowed, the option to delete polls is shown twice. This is fixed here by moving the if poll delete check out of the outer if, wich makes it also more consistent with the new event. PHPBB3-13787
Diffstat (limited to 'phpBB/phpbb/console/command/user')
0 files changed, 0 insertions, 0 deletions
c99a6a0b9a8f51'>Diffstat (limited to 'po/is.po')
-rw-r--r--po/is.po23
1 files changed, 11 insertions, 12 deletions
diff --git a/po/is.po b/po/is.po
index ba4c2c6f..941c81a4 100644
--- a/po/is.po
+++ b/po/is.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-21 14:52+0200\n"
+"POT-Creation-Date: 2005-04-21 15:09+0200\n"
"PO-Revision-Date: 2005-02-20 23:16+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <isl@molar.is>\n"
@@ -1417,7 +1417,7 @@ msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - setja aðeins inn frumkóða-pakka (engin forþýdd forrit).\n"
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2044,16 +2044,6 @@ msgstr ""
"\n"
"notkun:\n"
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-" --keep - keep existing packages if possible, reject requested\n"
-" packages that leads to remove.\n"
-msgstr ""
-" --keep - halda núverandi pökkum ef mögulegt er, hafna nýjum pökkum "
-"sem\n"
-" leiða til að núverandi pakkar séu fjarlægðir.\n"
-
#: ../urpmq:54
#, c-format
msgid " --list - list available packages.\n"
@@ -2203,6 +2193,15 @@ msgstr "Engir skráarlistar fundust\n"
msgid "No changelog found\n"
msgstr "Enginn breytilisti fannst\n"
+#, fuzzy
+#~ msgid ""
+#~ " --keep - keep existing packages if possible, reject requested\n"
+#~ " packages that leads to remove.\n"
+#~ msgstr ""
+#~ " --keep - halda núverandi pökkum ef mögulegt er, hafna nýjum "
+#~ "pökkum sem\n"
+#~ " leiða til að núverandi pakkar séu fjarlægðir.\n"
+
#~ msgid "unable to write file [%s]"
#~ msgstr "get ekki skrifað í skrá [%s]"