Merge lp://qastaging/~registry/monajat/translations into lp://qastaging/monajat
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~registry/monajat/translations |
Merge into: | lp://qastaging/monajat |
Diff against target: |
1400 lines (+1278/-0) (has conflicts) 22 files modified
po/az.po (+54/-0) po/bn.po (+59/-0) po/bs.po (+54/-0) po/de.po (+54/-0) po/en_GB.po (+54/-0) po/es.po (+127/-0) po/fa.po (+54/-0) po/fr.po (+54/-0) po/he.po (+55/-0) po/hu.po (+60/-0) po/id.po (+54/-0) po/jv.po (+54/-0) po/ku.po (+54/-0) po/ms.po (+54/-0) po/nds.po (+54/-0) po/nl.po (+54/-0) po/pt.po (+54/-0) po/ru.po (+54/-0) po/sv.po (+54/-0) po/tr.po (+54/-0) po/tt.po (+59/-0) po/uz.po (+54/-0) Conflict adding file po/de.po. Moved existing file to po/de.po.moved. Conflict adding file po/en_GB.po. Moved existing file to po/en_GB.po.moved. Conflict adding file po/es.po. Moved existing file to po/es.po.moved. Conflict adding file po/fa.po. Moved existing file to po/fa.po.moved. Conflict adding file po/fr.po. Moved existing file to po/fr.po.moved. Conflict adding file po/he.po. Moved existing file to po/he.po.moved. Conflict adding file po/id.po. Moved existing file to po/id.po.moved. Conflict adding file po/jv.po. Moved existing file to po/jv.po.moved. Conflict adding file po/ku.po. Moved existing file to po/ku.po.moved. Conflict adding file po/ms.po. Moved existing file to po/ms.po.moved. Conflict adding file po/pt.po. Moved existing file to po/pt.po.moved. Conflict adding file po/ru.po. Moved existing file to po/ru.po.moved. Conflict adding file po/tr.po. Moved existing file to po/tr.po.moved. |
To merge this branch: | bzr merge lp://qastaging/~registry/monajat/translations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Registry Administrators | Pending | ||
Review via email:
|
Description of the change
Adding txt (text file with Indonesian translation) on monajat-data directory :
.../monajat-data/
................/ar
................/id
etc
So Indonesia people can used it.
I've create a download source file at :
http://
Unmerged revisions
- 93. By Launchpad Translations on behalf of registry
-
Launchpad automatic translations update.
- 92. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 91. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 90. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 89. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 88. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 87. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 86. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 85. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
- 84. By Launchpad Translations on behalf of sabily.team
-
Launchpad automatic translations update.
السلام عليكم،
On Tue, Oct 12, 2010 at 07:22:40AM -0000, ari adrianto wrote:
> ari adrianto has proposed merging lp:~sabily.team/monajat/translations into lp:monajat.
>
> Requested reviews:
> Sabily Team (sabily.team)
>
>
> Adding txt (text file with Indonesian translation) on monajat-data directory :
>
> .../monajat-data/
> ................/ar
> ................/id
> etc
>
> So Indonesia people can used it.
---end quoted text---
According to: /code.launchpad .net/~sabily. team/monajat/ translations/ +merge/ 38184
https:/
You only did modifications to the po/ directory. Are you sure that you
filed a proper merge request ?
--
أحمد المحمودي (Ahmed El-Mahmoudy)
Digital design engineer
GPG KeyID: 0xEDDDA1B7
GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7