Banking Addons

Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-fr-completion-module into lp:banking-addons/bank-statement-reconcile-70

  1. bank-statement-reconcile-7.0-fix-fr-completion-module
  2. Merge into bank-statement-reconcile-70
Proposed by Yannick Vaucher @ Camptocamp
Status: Rejected
Rejected by: Yannick Vaucher @ Camptocamp
Proposed branch: lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-fr-completion-module
Merge into: lp:banking-addons/bank-statement-reconcile-70
Diff against target: 149 lines (+21/-21)
1 file modified
account_statement_base_completion/i18n/fr.po (+21/-21)
To merge this branch: bzr merge lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-fr-completion-module
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve
Romain Deheele - Camptocamp (community) code review Approve
Review via email: mp+223740@code.launchpad.net

Description of the change

Bad encoding in fr.po

To post a comment you must log in.
Revision history for this message
Romain Deheele - Camptocamp (romaindeheele) wrote :

add an inline comment

lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-fr-completion-module updated
160. By Yannick Vaucher @ Camptocamp

fix typo in fr.po

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Thx romain I've fixed it

Revision history for this message
Romain Deheele - Camptocamp (romaindeheele) wrote :

thanks, LGTM

review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

Regards.

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Ported on github -> rejected

Unmerged revisions

161. By Nicolas Bessi - Camptocamp

[ADD] a cron to run reconciles.
By default it runs one reconcile after the other to be more atomic
and memory friendly. But you can set run_all agrument to have all reconcile
run at once

160. By Yannick Vaucher @ Camptocamp

fix typo in fr.po

159. By Yannick Vaucher @ Camptocamp

Fix accents in fr.po for base_completion_module

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_statement_base_completion/i18n/fr.po'
2--- account_statement_base_completion/i18n/fr.po 2014-05-22 06:49:45 +0000
3+++ account_statement_base_completion/i18n/fr.po 2014-06-19 14:24:24 +0000
4@@ -20,7 +20,7 @@
5 #. module: account_statement_base_completion
6 #: view:account.statement.completion.rule:0
7 msgid "Related Profiles"
8-msgstr "Profils liés"
9+msgstr "Profils liés"
10
11 #. module: account_statement_base_completion
12 #: help:account.bank.statement.line,label:0
13@@ -40,7 +40,7 @@
14 #. module: account_statement_base_completion
15 #: field:account.bank.statement,completion_logs:0
16 msgid "Completion Log"
17-msgstr "Journal des complétions"
18+msgstr "Journal des complétions"
19
20 #. module: account_statement_base_completion
21 #: field:account.bank.statement.line,label:0
22@@ -50,7 +50,7 @@
23 #. module: account_statement_base_completion
24 #: model:ir.model,name:account_statement_base_completion.model_account_bank_statement
25 msgid "Bank Statement"
26-msgstr "Relevé bancaire"
27+msgstr "Relevé bancaire"
28
29 #. module: account_statement_base_completion
30 #: field:account.statement.completion.rule,function_to_call:0
31@@ -83,7 +83,7 @@
32 #. module: account_statement_base_completion
33 #: model:ir.model,name:account_statement_base_completion.model_account_bank_statement_line
34 msgid "Bank Statement Line"
35-msgstr "Ligne de relevé bancaire"
36+msgstr "Ligne de relevé bancaire"
37
38 #. module: account_statement_base_completion
39 #: field:account.bank.statement.line,additionnal_bank_fields:0
40@@ -93,12 +93,12 @@
41 #. module: account_statement_base_completion
42 #: view:account.statement.profile:0
43 msgid "Auto-Completion Rules"
44-msgstr "Règles d'auto-complétion"
45+msgstr "Règles d'auto-complétion"
46
47 #. module: account_statement_base_completion
48 #: view:account.bank.statement:0
49 msgid "Importation related infos"
50-msgstr "Importation des informations liées"
51+msgstr "Importation des informations liées"
52
53 #. module: account_statement_base_completion
54 #: code:addons/account_statement_base_completion/statement.py:159
55@@ -120,14 +120,14 @@
56 #. module: account_statement_base_completion
57 #: view:account.bank.statement:0
58 msgid "Auto Completion"
59-msgstr "Auto-complétion"
60+msgstr "Auto-complétion"
61
62 #. module: account_statement_base_completion
63 #: view:account.statement.completion.rule:0
64 #: model:ir.actions.act_window,name:account_statement_base_completion.action_st_completion_rule_tree
65 #: model:ir.ui.menu,name:account_statement_base_completion.menu_action_st_completion_rule_tree_menu
66 msgid "Statement Completion Rule"
67-msgstr "Règle d'auto-complétion du relevé"
68+msgstr "Règle d'auto-complétion du relevé"
69
70 #. module: account_statement_base_completion
71 #: model:ir.model,name:account_statement_base_completion.model_account_statement_completion_rule
72@@ -145,26 +145,26 @@
73 #: field:account.statement.completion.rule,profile_ids:0
74 #: field:account.statement.profile,rule_ids:0
75 msgid "Related statement profiles"
76-msgstr "Profils liés"
77+msgstr "Profils liés"
78
79 #. module: account_statement_base_completion
80 #: code:addons/account_statement_base_completion/statement.py:158
81 #: code:addons/account_statement_base_completion/statement.py:178
82 #, python-format
83 msgid "System error"
84-msgstr ""
85+msgstr "Erreur système"
86
87 #. module: account_statement_base_completion
88 #: field:account.bank.statement.line,already_completed:0
89 msgid "Auto-Completed"
90-msgstr "Auto-Completé"
91+msgstr "Auto-Completé"
92
93 #. module: account_statement_base_completion
94 #: code:addons/account_statement_base_completion/statement.py:448
95 #: code:addons/account_statement_base_completion/statement.py:466
96 #, python-format
97 msgid "ORM bypass error"
98-msgstr ""
99+msgstr "Erreur de bypass de l'ORM"
100
101 #. module: account_statement_base_completion
102 #: field:account.statement.completion.rule,sequence:0
103@@ -182,12 +182,12 @@
104 #. module: account_statement_base_completion
105 #: help:account.statement.completion.rule,sequence:0
106 msgid "Lower means parsed first."
107-msgstr "Plus petite séquence analysée en premier."
108+msgstr "Plus petite séquence analysée en premier."
109
110 #. module: account_statement_base_completion
111 #: field:res.partner,bank_statement_label:0
112 msgid "Bank Statement Label"
113-msgstr "Description de relevé bancaire"
114+msgstr "Description de relevé bancaire"
115
116 #. module: account_statement_base_completion
117 #: help:account.bank.statement.line,already_completed:0
118@@ -195,8 +195,8 @@
119 "When this checkbox is ticked, the auto-completion process/button will ignore "
120 "this line."
121 msgstr ""
122-"Les lignes cochées seront ignorées lorsque vous cliquez sur le bouton auto-"
123-"complétion"
124+"Les lignes cochées seront ignorées lorsque vous cliquez sur le bouton auto-"
125+"complétion"
126
127 #. module: account_statement_base_completion
128 #: help:res.partner,bank_statement_label:0
129@@ -206,10 +206,10 @@
130 "partner will be automatically filled (as long as you use "
131 "this method/rules in your statement profile)."
132 msgstr ""
133-"Entrez les différentes descriptions/informations sur votre relevé bancaire "
134-"séparées par un ';' Si l'une d'entre elles figure dans la ligne du "
135-"relevé, le partenaire correspondant pourraêtre automatiquement retrouvé "
136-"(à condition d'utiliser un règle de lettrage dans le profil)."
137+"Entrez les différentes descriptions/informations sur votre relevé bancaire "
138+"séparées par un ';' Si l'une d'entre elles figure dans la ligne du "
139+"relevé, le partenaire correspondant sera automatiquement retrouvé "
140+"(A condition d'utiliser un règle de lettrage dans le profil)."
141
142 #. module: account_statement_base_completion
143 #: model:ir.model,name:account_statement_base_completion.model_res_partner
144@@ -219,4 +219,4 @@
145 #. module: account_statement_base_completion
146 #: view:account.bank.statement:0
147 msgid "Completion Logs"
148-msgstr "Journaux d'auto-complétion"
149+msgstr "Journaux d'auto-complétion"

Subscribers

People subscribed via source and target branches