aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-fr (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-241-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG.md README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/layout/account_row.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| * sync translations with transifexDaniel Gultsch2015-08-031-2/+0
| |
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-5/+0
| |
| * added missing translations from transifexDaniel Gultsch2015-04-211-1/+0
| |
| * Update french translationErkan2015-03-221-0/+4
| |
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-6/+4
| |
* | added settings for accepting and downloading fileslookshe2015-04-121-1/+1
|/ | | | fix in Settings, initialize with same values like in preferences.xml
* pulled new translations from transifexiNPUTmice2015-03-161-1/+21
|
* pulled translations from transifexiNPUTmice2015-02-161-0/+1
|
* pulled translations from transifexiNPUTmice2015-02-011-0/+5
|
* Remove title_activity_conversations and use app_name insteadkruks232015-01-301-1/+0
|
* Remove legacy SSL supportSam Whited2015-01-191-1/+0
|
* fetched translations from transifexiNPUTmice2015-01-191-354/+404
|
* Correct the download file string on notificationsSam Whited2015-01-171-1/+0
| | | | Fixes #896
* make project translatable via transifexDaniel Gultsch2015-01-091-26/+0
|
* Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| | | char ">" was missing at line 285
* Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
| | | French translation updated
* Updated languages for higher auto accept file sizes and changed labeling to ↵Christian Schneppe2015-01-051-21/+23
| | | | MiB and KiB
* Make `app_name' string untranslatableSam Whited2014-12-291-1/+0
| | | | | | Remove untranslatable about message Escape single quote in NL translation
* Make conversations the root projectSam Whited2014-10-222-0/+297
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 20:06:11 +0000