Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
fb27af79
Commit
fb27af79
authored
Jul 14, 2014
by
Tails developers
Browse files
resolve faulty merge
parent
8d875ffd
Changes
26
Hide whitespace changes
Inline
Side-by-side
wiki/src/doc/about.index.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:50-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/about/fingerprint.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:53-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/about/requirements.pt.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 11:28-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/about/tor.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:35-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/advanced_topics.index.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 21:02-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/advanced_topics/cold_boot_attacks.pt.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-10 15:02+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-21 17:11-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/anonymous_internet.index.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/anonymous_internet.index.pt.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 13:58-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/anonymous_internet/networkmanager.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:37-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/anonymous_internet/pidgin.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2013-08-05 11:04+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/anonymous_internet/unsafe_browser.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:03-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/anonymous_internet/vidalia.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:23-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/encryption_and_privacy.index.pt.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 14:22-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:29-0000\n"
"Last-Translator: \n"
"Language-Team: <LL@li.org>\n"
...
...
wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 20:32-0000\n"
"Last-Translator: \n"
"Language-Team: sLANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 19:33-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/first_steps/persistence/configure.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:09+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-10 19:33-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
...
...
wiki/src/doc/first_steps/persistence/warnings.pt.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 14:54-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/get.index.pt.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-23 12:48-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
wiki/src/doc/introduction.fr.po
View file @
fb27af79
...
...
@@ -6,11 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-06-05 10:10+0300\n"
=======
"POT-Creation-Date: 2014-06-08 19:38+0300\n"
>>>>>>> a63d5978309e796fcd832d6cd5824f31652c4ba4
"PO-Revision-Date: 2014-05-11 13:36-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment