Commits · 93c94efaa0c7f1506d2cbb79c5a19e2b10f1ad01 · tails / tails

03 Jan, 2016 22 commits
- Update wiki/src/**/*.it.po. · 93c94efa
  intrigeri authored Jan 03, 2016
  
  93c94efa
- Merge remote-tracking branch 'origin' into italian · aba9e59e
  intrigeri authored Jan 03, 2016
  
  aba9e59e
- Restore file permissions that were lost in commit 651420ad . · 53435566
  intrigeri authored Jan 03, 2016
  
  53435566
- Enable Farsi in the language statistics script. · 247045dd
  intrigeri authored Jan 03, 2016
  
  247045dd
- No commit message · 84f304a9
  127.0.0.1 authored Jan 03, 2016
```
No commit message
```
  84f304a9
- Merge remote-tracking branch 'origin/master' into italian · 4e9e1d1e
  intrigeri authored Jan 03, 2016
  
  4e9e1d1e
- let this sound a bit nicer · 7606fe1f
  127.0.0.1 authored Jan 03, 2016
  
  7606fe1f
- updated PO files · 99ae2b35
  amnesia authored Jan 03, 2016
  
  99ae2b35
- Hide Mac keyboard screenshot when not on Mac · 38ce2c08
  sajolida authored Jan 03, 2016
  
  38ce2c08
- No commit message · 1faf4094
  127.0.0.1 authored Jan 03, 2016
```
No commit message
```
  1faf4094
- No commit message · 72369348
  127.0.0.1 authored Jan 03, 2016
```
No commit message
```
  72369348
- No commit message · 3721220f
  127.0.0.1 authored Jan 03, 2016
```
No commit message
```
  3721220f
- Merge remote-tracking branch 'elouann/from-atomike-test_2.0-beta1' · 03c14c03
  intrigeri authored Jan 03, 2016
  
  03c14c03
- Merge remote-tracking branch 'sycamoreone/de_tails_181' · c8f65755
  intrigeri authored Jan 03, 2016
  
  c8f65755
- Merge remote-tracking branch 'sycamoreone/de_tails_18' · 258bbc22
  intrigeri authored Jan 03, 2016
  
  258bbc22
- Merge remote-tracking branch 'muri/muri-t10n/review-de_persistence-use' · c11fa954
  intrigeri authored Jan 03, 2016
  
  c11fa954
- Merge remote-tracking branch 'muri/muri-t10n/review-de_persistence-warnings' · b10c8fd3
  intrigeri authored Jan 03, 2016
  
  b10c8fd3
- Merge remote-tracking branch 'spriver/review-de_install-win-usb' · b2524650
  intrigeri authored Jan 03, 2016
  
  b2524650
- Merge remote-tracking branch 'muri/muri-t10n/review-de_persistence-copy' · fda990c9
  intrigeri authored Jan 03, 2016
  
  fda990c9
- Merge remote-tracking branch 'muri/muri-t10n/review-de_persistence-configure' · 080b99e2
  intrigeri authored Jan 03, 2016
  
  080b99e2
- Merge remote-tracking branch 'muri/muri-t10n/review-de_persistence' · 061e114a
  intrigeri authored Jan 03, 2016
  
  061e114a
- Add TOC. · 90691fba
  intrigeri authored Jan 03, 2016
  
  90691fba
02 Jan, 2016 18 commits
- updated PO files · 106341d3
  amnesia authored Jan 03, 2016
  
  106341d3
- Reviewed translation, adjusted wording, added .de to inline paths · 1077f9f7
  spriver authored Jan 02, 2016
  
  1077f9f7
- rebased on master and updated translations · 2e60c4f9
  muri authored Jan 02, 2016
  
  2e60c4f9
- [de] review, minor improvements · 186c935c
  Tails developers authored Dec 13, 2015 and muri committed Jan 02, 2016
  
  186c935c
- initial translation of the install wizard windows usb page · 81118048
  muri authored Dec 11, 2015
  
  81118048
- added 0x to the beginning of the long keyid, because two users already asked... · 6478a7c6
  muri authored Jan 02, 2016
```
added 0x to the beginning of the long keyid, because two users already asked about that. also there where two typos in the gpg output
```
  6478a7c6
- reviewed sprivers commit and changed Kennwort to Passphrase · d7f7c5b3
  muri authored Jan 02, 2016
  
  d7f7c5b3
- merged sprivers commit · aedd9255
  muri authored Jan 02, 2016
  
  aedd9255
- merged and reviewed the configure.de.po file from sprivers branch · c947072e
  muri authored Jan 02, 2016
  
  c947072e
- merged and reviewed the use file from sprivers branch · be22e1a7
  muri authored Jan 02, 2016
  
  be22e1a7
- merged and reviewed the warning file from sprivers branch · 671b47d5
  muri authored Jan 02, 2016
  
  671b47d5
- merged sprivers commit and fixed one typo · 3bf66620
  muri authored Jan 02, 2016
  
  3bf66620
- link to ticket · 82a502fc
  127.0.0.1 authored Jan 02, 2016
  
  82a502fc
- Blueprints++ · 371a6675
  intrigeri authored Jan 02, 2016
  
  371a6675
- Also point to #6116 . · 0a1ea361
  intrigeri authored Jan 02, 2016
  
  0a1ea361
- [fr] review of atomike/test_2.0-beta1 · 7a1bcd1f
  elouann authored Jan 02, 2016
  
  7a1bcd1f
- Merge branch 'master' of https://git-tails.immerda.ch/tails into from-atomike-test_2.0-beta1 · 694210bc
  elouann authored Jan 02, 2016
```
Conflicts:
	wiki/src/news/test_2.0-beta1.fr.po
```
  694210bc
- Add blueprint. · f44e6e58
  intrigeri authored Jan 02, 2016
  
  f44e6e58