Update to the Russian translation & small fixes for others#1608
Update to the Russian translation & small fixes for others#1608frcdr wants to merge 3 commits intomicrog:masterfrom frcdr:master
Conversation
|
|
||
| <string name="open_app">Aprire</string> |
There was a problem hiding this comment.
Please don't add this. The translation is wrong and the missing string has been addressed in #1457 (waiting to be merged).
There was a problem hiding this comment.
Thank you for the help! My Italian is not the best, so I should have seen that one coming.
Tried to cancel any changes done to this file in my commit, and since it is my first time doing something serious with git, I seem to have just pulled a commit to remove the file altogether. UPD reverted the commit
There was a problem hiding this comment.
I think that the simplest way in your scenario is to make another commit that removes the lines you added to the file.
Otherwise you could do a git checkout <commit sha> -- <path/to/file> to replace the current contents of the file with the contents of the file in that specified commit.
Btw, if you're new to Git I'd recommend you to follow this course on Pluralsight (there is a 10-day free trial), it really helped me a lot!
There was a problem hiding this comment.
Oh, sure — I forgot I was supposed to actually remove my string from the file. Got distracted by my mistake. The line is no longer there in my pull request, thanks!
There was a problem hiding this comment.
Sorry if I sound pedantic, but it would be best if you could also remove the extra new line added to the Italian strings file, so that this PR won't conflict with #1457 when any of the two gets merged. Thanks :)
|
@firocodiro |
|
Could you please fix conflicts? |
There was a problem hiding this comment.
Спасибо, что нашли время улучшить перевод. Особенно, за файл с пермишнами до которого не доходили руки.
К вашему переводу претензий почти нет, кроме пары неточностей, которые я указал.
Я бы вас всё же попросил пересмотреть некоторые строки, которые стали ощутимо длиннее исходных вариантов, так как microG часто ставят на старые устройства с маленькими экранами и информация не будет помещаться, особенно это касается текста в уведомлениях. Пробегитесь взглядом по удлиннившимся строкам и по возможности попробуйте их уменьшить без вреда для смысла.
Ну и еще не помешало бы доперевести несколько новых строк
0497f7e
И сделать rebase, а то много коммитов скопилось :-)
|
Turns out that even creating a pull request for a translation can be rather difficult for someone who’s never had to deal with git before (other than |
Russian text specifically is now more consistent in terms of terminology and is easier to understand.