This is an automated email from the git hooks/post-receive script.
nodens-guest pushed a commit to annotated tag OpenPGP_Applet-0.9
in repository openpgp-applet.
commit fdfeae8c6d656911ba5e82ef01d87a39eb32e15a
Merge: 4c7320c 9846a5a
Author: Clément Hermann (nodens) <nod...@nodens.org>
Date: Fri Nov 28 23:23:39 2014 +0100
Merge branch 'feature/add_i18n'
Conflicts:
bin/openpgp-applet
(due to c87fb47b1db3dbf92a941f9d3a55fd7f74739034)
bin/openpgp-applet | 91 ++++++++++----------
dist.ini | 8 +-
po/Makefile | 93 +++++++++++++++++++++
po/OpenPGP_Applet.pot | 170 +++++++++++++++++++++++++++++++++++++
po/PACKAGE | 44 ++++++++++
po/POTFILES.in | 1 +
po/ar.po | 199 +++++++++++++++++++++++++++++++++++++++++++
po/ca.po | 182 ++++++++++++++++++++++++++++++++++++++++
po/cs.po | 184 ++++++++++++++++++++++++++++++++++++++++
po/cy.po | 185 ++++++++++++++++++++++++++++++++++++++++
po/da.po | 185 ++++++++++++++++++++++++++++++++++++++++
po/de.po | 187 +++++++++++++++++++++++++++++++++++++++++
po/el.po | 182 ++++++++++++++++++++++++++++++++++++++++
po/en_GB.po | 178 +++++++++++++++++++++++++++++++++++++++
po/es.po | 181 ++++++++++++++++++++++++++++++++++++++++
po/fa.po | 184 ++++++++++++++++++++++++++++++++++++++++
po/fi.po | 181 ++++++++++++++++++++++++++++++++++++++++
po/fr.po | 180 +++++++++++++++++++++++++++++++++++++++
po/fr_CA.po | 183 ++++++++++++++++++++++++++++++++++++++++
po/hr_HR.po | 184 ++++++++++++++++++++++++++++++++++++++++
po/hu.po | 182 ++++++++++++++++++++++++++++++++++++++++
po/id.po | 176 ++++++++++++++++++++++++++++++++++++++
po/it.po | 189 +++++++++++++++++++++++++++++++++++++++++
po/ja.po | 179 +++++++++++++++++++++++++++++++++++++++
po/km.po | 173 ++++++++++++++++++++++++++++++++++++++
po/ko.po | 174 ++++++++++++++++++++++++++++++++++++++
po/lv.po | 181 ++++++++++++++++++++++++++++++++++++++++
po/nb.po | 181 ++++++++++++++++++++++++++++++++++++++++
po/nl.po | 188 +++++++++++++++++++++++++++++++++++++++++
po/pl.po | 186 +++++++++++++++++++++++++++++++++++++++++
po/pt.po | 184 ++++++++++++++++++++++++++++++++++++++++
po/pt_BR.po | 185 ++++++++++++++++++++++++++++++++++++++++
po/ru.po | 195 +++++++++++++++++++++++++++++++++++++++++++
po/sk.po | 182 ++++++++++++++++++++++++++++++++++++++++
po/sk_SK.po | 180 +++++++++++++++++++++++++++++++++++++++
po/sl_SI.po | 184 ++++++++++++++++++++++++++++++++++++++++
po/sv.po | 181 ++++++++++++++++++++++++++++++++++++++++
po/tr.po | 185 ++++++++++++++++++++++++++++++++++++++++
po/uk.po | 190 ++++++++++++++++++++++++++++++++++++++++++
po/zh.po | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_CN.po | 177 +++++++++++++++++++++++++++++++++++++++
po/zh_TW.po | 175 ++++++++++++++++++++++++++++++++++++++
42 files changed, 6986 insertions(+), 50 deletions(-)
diff --cc bin/openpgp-applet
index e4f7c0b,16e0618..c003934
--- a/bin/openpgp-applet
+++ b/bin/openpgp-applet
@@@ -319,22 -319,20 +318,21 @@@ sub get_status
my $status;
my $trusted;
# Below taken from doc/DETAILS in GnuPG's sources
- switch ($code) {
- case "o" { $trusted = FALSE;
- $status = $encoding->decode(__("Unknown Trust")); }
- case "-" { $trusted = FALSE;
- $status = $encoding->decode(__("Unknown Trust")); }
- case "q" { $trusted = FALSE;
- $status = $encoding->decode(__("Unknown Trust")); }
- case "m" { $trusted = FALSE;
- $status = $encoding->decode(__("Marginal Trust")); }
- case "f" { $trusted = TRUE;
- $status = $encoding->decode(__("Full Trust")); }
- case "u" { $trusted = TRUE;
- $status = $encoding->decode(__("Ultimate Trust")); }
- else { return; }
+ SWITCH:
+ for ($code){
+ if ($_ eq "o") { $trusted = FALSE;
- $status = $encoding->decode(gettext("Unknown Trust"));
last SWITCH; }
++ $status = $encoding->decode(__("Unknown Trust")); last
SWITCH; }
+ if ($_ eq "-") { $trusted = FALSE;
- $status = $encoding->decode(gettext("Unknown Trust"));
last SWITCH; }
++ $status = $encoding->decode(__("Unknown Trust")); last
SWITCH; }
+ if ($_ eq "q") { $trusted = FALSE;
- $status = $encoding->decode(gettext("Unknown Trust"));
last SWITCH; }
++ $status = $encoding->decode(__("Unknown Trust")); last
SWITCH; }
+ if ($_ eq "m") { $trusted = FALSE;
- $status = $encoding->decode(gettext("Marginal Trust"));
last SWITCH; }
++ $status = $encoding->decode(__("Marginal Trust")); last
SWITCH; }
+ if ($_ eq "f") { $trusted = TRUE;
- $status = $encoding->decode(gettext("Full Trust")); last
SWITCH; }
++ $status = $encoding->decode(__("Full Trust")); last
SWITCH; }
+ if ($_ eq "u") { $trusted = TRUE;
- $status = $encoding->decode(gettext("Ultimate Trust"));
last SWITCH; }
++ $status = $encoding->decode(__("Ultimate Trust")); last
SWITCH; }
+ return;
-
}
return ($status, $trusted);
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/openpgp-applet.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
