French localization: translation of empty strings #955
Conversation
mlep
commented
Mar 13, 2016
mlep
commented
- Change in CHANGELOG.md described?
- Changes in pull request outlined? (What, why, ...)
- Tests created for changes?
- Tests green?
| Abbreviate_journal_names=Abrégez_les_noms_de_journaux | ||
| Abbreviating...=Abrègement_en_cours | ||
| Adding_fetched_entries=Ajout_des_entrées_récupérées | ||
| Are_you_sure_you_want_to_remove_the_already_existent_SQL_DBs?=Etes-vous_sûr_de_vouloir_supprimer_une_base_SQL_existante_? |
There was a problem hiding this comment.
There should not be a whitespace in front of the "?", or?
There was a problem hiding this comment.
Okay I just found out, that you french guys place a whitespace in front of question marks ;-)
So forget about my comments...
|
@matthiasgeiger : Hello, could this pull request be merged? |
|
@mlep: can you please rebase and I'll merge it. |
|
Hello @oscargus , I do not what does "rebase" exactly means... In fact, I carried out all these changes online. |
|
Ah, OK! It basically means "apply your changes again on the latest version
of the file", which is done by a command so no need to actually do it again
for you. No need to worry though. I'm sure someone with more knowledge
than me can merge this. (The reason being that someone managed to squeeze
in a few new strings, so now Github can not simply combine the files.)
|
|
Hm, I just merge this in by following the instructions given at the link under command line instructions. |
simonharrer
force-pushed
the
mlep-patch-2
branch
from
e2dbe02
to
00cb505
Compare
|
Oh there's a link. :-)
|
|
Thanks for merging. |
|
The link is no longer here, as it only appears when there is a conflict with the pull request. :) |
|
Was it something like:
? |
|
Yes, but as I do have the rights, it shows a link there with instructions to merge it manually. |
|
OK. I first thought I had missed to read the instructions... |
