5160 Commits

Author SHA1 Message Date
Peng Zhong
06d164d461 fix jade upgrade bug 2014-10-08 12:01:23 +08:00
Peng Zhong
c764d2686e update node.js packages to latest version 2014-10-08 12:00:58 +08:00
Peng Zhong
bb4f2082f3 Merge pull request #1162 from jeroenpraat/master
RedMatrix: added 'communication protocols' as category
2014-10-06 09:34:06 +08:00
jeroenpraat
d903a20630 Wrong path to redmatrix licence 2014-10-06 00:27:14 +02:00
jeroenpraat
5225ff2aed oops 2014-10-05 22:31:57 +02:00
jeroenpraat
62a89d01d4 I forgot to mention **communication protocol**, ZOT (part of the RedMatrix) is. https://redmatrix.nl/help/what_is_zot. 2014-10-05 22:20:52 +02:00
Peng Zhong
cc737734cc add redmatrix logo (png versions) and add text to all languages #749 #1159 #1160 2014-10-05 08:33:07 +08:00
Peng Zhong
e8a22da31c Merge pull request #1160 from jeroenpraat/patch-2
Created redmatrix.svg, to be used for redmatrix.png
2014-10-04 21:48:09 +08:00
Peng Zhong
774fa15027 Merge pull request #1159 from jeroenpraat/patch-1
+redmatrix
2014-10-04 21:47:29 +08:00
jeroenpraat
64aea52b80 Created redmatrix.svg, to be used for redmatrix.png
I can't upload png files using the GitHub web interface. Please use this SVG file to create redmatrix.png
2014-10-04 14:50:56 +02:00
jeroenpraat
ae2a17de35 +redmatrix 2014-10-04 14:14:34 +02:00
Peng Zhong
f73c474449 Merge pull request #1157 from dschuermann/master
Update OpenKeychain note and fix link
2014-10-03 21:11:20 +08:00
Dominik Schürmann
3701dda0ff Update OpenKeychain note and fix link 2014-10-03 03:34:58 +02:00
Peng Zhong
8134eed2c3 add links to emailselfdefense.fsf.org to Enigmail notes 2014-09-18 14:33:17 +08:00
Peng Zhong
ade0b6948b add links to emailselfdefense.fsf.org to Email Encryption notes 2014-09-18 14:26:18 +08:00
Peng Zhong
7ec9f7e57c merge #1151 2014-09-15 10:29:27 +08:00
victorhck
c50698315b es:Updated more spanish translation 2014-09-13 11:47:04 +02:00
Peng Zhong
9f7d81401b Merge pull request #1142 from alerque/turkish-translations
Turkish translations
2014-09-02 19:55:08 +08:00
Caleb Maclennan
7095f9ab97 clean up Turkish localizations
* fix negation errors that were giving the opposite meaning
* normalize capitalization per original EN source strings
* translate a few more strings
* use consistent translation choices for the same technologies throughout
2014-09-02 12:44:33 +03:00
Caner Başaran
65d279822f localised some strings 2014-09-02 12:43:59 +03:00
Peng Zhong
937ca8c18b fix open-keychain github url 2014-09-02 12:29:50 +08:00
Peng Zhong
c5f42bd264 Merge branch 'victorhck-master' 2014-09-02 12:26:08 +08:00
Peng Zhong
deb79e82b5 merge 2014-09-02 12:26:02 +08:00
Peng Zhong
cc2b1f767e remove extra line 2014-09-02 12:24:04 +08:00
Peng Zhong
7db6b33102 fix sr translation order 2014-09-02 12:22:13 +08:00
Peng Zhong
183814a5dc remove references to Jappix and start cleaing up sr json 2014-09-02 11:56:42 +08:00
Peng Zhong
0efed3bd50 remove duplicate 'Media Publishing' stub 2014-09-02 11:39:27 +08:00
Peng Zhong
e78f10ee22 Merge branch 'alerque-localization-fixes' 2014-09-02 11:32:17 +08:00
Peng Zhong
ffc32866bc fix tr.json 2014-09-02 11:32:07 +08:00
Peng Zhong
8544646d63 rename OpenPGP Keychain to OpenKeychain 2014-09-02 11:28:37 +08:00
Peng Zhong
1f4ff7ce1e Merge pull request #1097 from sedrubal/master
changed adblock edge logo
2014-09-02 11:15:12 +08:00
Peng Zhong
fe11ded608 Merge pull request #1096 from SecUpwN/master
Added German Translation and updated Descriptions
2014-09-02 11:14:18 +08:00
Peng Zhong
b7eb56993a Merge pull request #1090 from canerbasaran/master
localised some strings
2014-09-02 11:13:45 +08:00
Peng Zhong
1e946c3b47 Merge pull request #1089 from Cathryne/patch-1
localised some URLs
2014-09-02 11:13:30 +08:00
Peng Zhong
b08ade5e86 Merge pull request #1088 from wifiextender/master
ostel fix
2014-09-02 11:13:04 +08:00
Peng Zhong
506dcb283a Merge branch 'master' of github.com:nylira/prism-break 2014-08-31 14:17:50 +08:00
Martijn van der Ven
9f683b97e5 Merge pull request #1122 from plastipeta/fix-README
Fixed URLs in README
2014-08-30 00:13:45 +02:00
plastipeta
abb2ae3d0a Fixed URLs in README 2014-08-29 18:39:26 +01:00
Peng Zhong
ef5db25835 Merge branch 'master' of github.com:nylira/prism-break 2014-08-21 01:53:18 +08:00
victorhck
d3e236a8b1 updated Spanish translations with more stuff 2014-08-19 17:21:47 +02:00
Caleb Maclennan
a1c52e10e3 remove trailing whitespace; normalize line breaks
Having inconsistent line breaks and extra spaces makes files harder to
process automatically for anomalies or other bulk work. This cleans up
some trailing whitespace that had gotten in for a couple strings in many
languages as well as removing line breaks that are inconsistent with the
way the rest of the file was formatted.
2014-08-19 11:23:05 +03:00
Caleb Maclennan
54c0969983 localize hard coded segment to fix word order
Strings cannot be properly localized into some languages without being
able to change the word order. The hard coded 'Bitcoin' coming after the
translated 'Donate' string meant it was impossible to make a sensible
translation into Turkish. By expanding the localized portion of the
string to include the bit tacked on, each language can now make their
own choice as to word order.

I fixed the Turkish translation and guessed at all the others. The RTL
languages such as Arabic, Farsi, and Hebrew may need review, and other
agglutinated languages like Turkish should probably consider whether a
more natural translation can now be made.
2014-08-19 11:13:06 +03:00
Martijn van der Ven
c3c0354b3f Merge pull request #1107 from Cathryne/patch-2
little correction as suggested in #1106
2014-08-19 09:49:18 +02:00
Cathryne
25b53dd944 little correction as suggested in #1106 2014-08-19 07:15:15 +02:00
Peng Zhong
20e7acda87 Merge branch 'master' of github.com:nylira/prism-break 2014-08-10 15:26:48 +08:00
SecUpwN
010476e206 Erasing the doubt. We will make it! 2014-08-08 07:36:56 +02:00
Martijn van der Ven
69cf04581e Merge pull request #1098 from pierreozoux/master
Update pt locales
2014-08-06 10:57:24 +02:00
Pierre Ozoux
5b5fdae18c Update pt locales 2014-08-06 08:13:45 +01:00
sedrubal
452768f077 renamed OpenPGP Keychain to OpenKeychain and changed links 2014-08-05 16:28:54 +02:00
Sedrubal
f6a317e372 Delete .directory 2014-08-05 15:41:31 +02:00