Skip to content

Replaced some strings#994

Merged
matthiasgeiger merged 4 commits intoJabRef:masterfrom
oscargus:fewertranslations
Mar 31, 2016
Merged

Replaced some strings#994
matthiasgeiger merged 4 commits intoJabRef:masterfrom
oscargus:fewertranslations

Conversation

@oscargus
Copy link
Copy Markdown
Contributor

Unified some translations to reduce the number of translations.

Related to #869 : It seems like some encoding changed. I do not fully understand why since I didn't do anything active here. Any ideas which is the better approach? Are they even different?

(There are some obsolete strings which will be removed once #869 is merged.)

Marked_all_%0_selected_entries=%0_entrées_sélectionnées_étiquetées
Marked_selected_entry=Entrées_sélectionnées_étiquetées
Table_row_height_padding=Espacement_en_hauteur_des_rang\u00e9es_de_tableau
Set_rank_to_'%0'_for_%1_entries=Rang_mis_\u00e0_'%0'_pour_%1_entr\u00e9es
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to keep the plain UTF-8 characters instead of using \u....?

@oscargus
Copy link
Copy Markdown
Contributor Author

Indeed it is. I have figured out a method for this, so I'll apply it to all files when I rebase.

@oscargus oscargus force-pushed the fewertranslations branch from fed08fa to caf0d06 Compare March 30, 2016 20:13
@oscargus oscargus force-pushed the fewertranslations branch from caf0d06 to dd6df06 Compare March 30, 2016 20:23
@oscargus oscargus force-pushed the fewertranslations branch from 6b690ad to 8496384 Compare March 30, 2016 20:44
@oscargus
Copy link
Copy Markdown
Contributor Author

Now (almost) everything is actually encoded in UTF-8. There are some odd flaws and I had to sort the Chinese translations to sort a few things out. There are probably duplicates for some translations caused by the merging, but as far as I know that doesn't cause any problems. Maybe we should add a check for that later on as well?

@tobiasdiez
Copy link
Copy Markdown
Member

LG in my opinion. I'm not sure if we really want to merge this before the release of 3.3 since it is a rather large change.

@oscargus
Copy link
Copy Markdown
Contributor Author

I see your point, but let me tell you how the change is made (can be good for later reference):

  1. Load the file in Eclipse (I have some plugin which shows the escaped Unicode as actual Unicode, I think it helps).
  2. Ctrl-a Ctrl-c
  3. Open the same file in NotePad++
  4. Ctrl-a Ctrl-v
  5. Save in NotePad++

The only potential drawback of not merging now is that there will be more duplicates when rebasing later with files possibly not entirely in UTF-8. Not a major issue.

@matthiasgeiger
Copy link
Copy Markdown
Member

There are indeed some files with duplicates... IntelliJ is highlighting them as errors, so its rather easy for me to get rid of them.

I'll do this and push the result in the repository here.

As it is rather easy to check whether the changes work by simply running JabRef in all languages I would merge this in for the 3.3 release.

@matthiasgeiger
Copy link
Copy Markdown
Member

Result is here... if there is no veto I'll merge this directly into master without creating another pull request after lunch 😉

@Siedlerchr
Copy link
Copy Markdown
Member

Looks good!

2016-03-31 9:28 GMT+02:00 Matthias Geiger notifications@github.com:

Result is here
https://github.com/JabRef/jabref/compare/oscargus-fewertranslations...
if there is no veto I'll merge this directly into master without creating
another pull request after lunch [image: 😉]


You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#994 (comment)

@matthiasgeiger matthiasgeiger merged commit 8496384 into JabRef:master Mar 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants