luci-0.9: merge r4950

diff --git a/modules/freifunk/luasrc/view/freifunk/remote_update.htm b/modules/freifunk/luasrc/view/freifunk/remote_update.htm
index 3dfaf5d5c22555c5f92caa940ba8dd2f93779d75..47ac7a3564e787497a991db5e4e38f7872a9e2ac 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/remote_update.htm
+++ b/modules/freifunk/luasrc/view/freifunk/remote_update.htm
@@ -49,9 +49,9 @@ $Id: contact.htm 3529 2008-10-07 13:10:24Z jow $
                <label for="cb_keepcfg"><%:ff_remote_update_keepcfg Keep configuration%></label><br />
 
                <input type="checkbox" class="cbi-input-checkbox" name="verify" value="1" checked="checked" id="cb_verify" />
-               <label for="cb_verify"><%:ff_remote_update_keepcfg Verify downloaded images%></label><br /><br />
+               <label for="cb_verify"><%:ff_remote_update_verify Verify downloaded images%></label><br /><br />
 
-               <input type="submit" class="cbi-button cbi-button-apply" value="<%:ff_remote_update_install Confirm Upgrade%>" />
+               <input type="submit" class="cbi-button cbi-button-apply" value="<%:ff_remote_update_confirm Confirm Upgrade%>" />
        </form></p>
 
 <% end %>

diff --git a/po/de/freifunk.po b/po/de/freifunk.po
index 7728c26c76adc5f4544f121b848aae1502014fa0..bbc44de59fb84893dd14991e7ca280ed0bd9e281 100644 (file)
--- a/po/de/freifunk.po
+++ b/po/de/freifunk.po
@@ -252,9 +252,9 @@ msgid "ff_remote_update_keepcfg"
 msgstr "Konfigurationsdateien wiederherstellen"
 
 #. Verify downloaded images
-msgid "ff_remote_update_keepcfg"
+msgid "ff_remote_update_verify"
 msgstr "Heruntergeladene Images verifizieren"
 
 #. Confirm Upgrade
-msgid "ff_remote_update_install"
+msgid "ff_remote_update_confirm"
 msgstr "Update bestätigen"

diff --git a/po/en/freifunk.po b/po/en/freifunk.po
index a4127dc96e087841ae55df2739a7304cd6588a11..da282f051bc97f382e40d129db962da31e6c1556 100644 (file)
--- a/po/en/freifunk.po
+++ b/po/en/freifunk.po
@@ -248,9 +248,9 @@ msgid "ff_remote_update_keepcfg"
 msgstr "Keep configuration"
 
 #. Verify downloaded images
-msgid "ff_remote_update_keepcfg"
+msgid "ff_remote_update_verify"
 msgstr "Verify downloaded images"
 
 #. Confirm Upgrade
-msgid "ff_remote_update_install"
+msgid "ff_remote_update_confirm"
 msgstr "Confirm Upgrade"

diff --git a/po/templates/freifunk.pot b/po/templates/freifunk.pot
index 66b9da7ae59a3a1241a6b6005170b955d8c1a1dc..2d92108b6da16e0395379cf407c644319554d15e 100644 (file)
--- a/po/templates/freifunk.pot
+++ b/po/templates/freifunk.pot
@@ -233,9 +233,9 @@ msgid "ff_remote_update_keepcfg"
 msgstr ""
 
 #. Verify downloaded images
-msgid "ff_remote_update_keepcfg"
+msgid "ff_remote_update_verify"
 msgstr ""
 
 #. Confirm Upgrade
-msgid "ff_remote_update_install"
+msgid "ff_remote_update_confirm"
 msgstr ""