Skip to content

Comments

Update to the Russian translation & small fixes for others#1608

Closed
frcdr wants to merge 3 commits intomicrog:masterfrom
frcdr:master
Closed

Update to the Russian translation & small fixes for others#1608
frcdr wants to merge 3 commits intomicrog:masterfrom
frcdr:master

Conversation

@frcdr
Copy link

@frcdr frcdr commented Nov 11, 2021

Russian text specifically is now more consistent in terms of terminology and is easier to understand.

Comment on lines 12 to 13

<string name="open_app">Aprire</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't add this. The translation is wrong and the missing string has been addressed in #1457 (waiting to be merged).

Copy link
Author

@frcdr frcdr Nov 11, 2021

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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!

Copy link
Author

Choose a reason for hiding this comment

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

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!

Copy link
Contributor

Choose a reason for hiding this comment

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

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 :)

Copy link
Author

Choose a reason for hiding this comment

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

No problem! :D

@ale5000-git
Copy link
Member

@firocodiro
I'm not sure if mar-v-in want to have translated README.md.
I suggest to put it in a separate pull request so it can be evaluated separately.

@ale5000-git
Copy link
Member

Could you please fix conflicts?

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Спасибо, что нашли время улучшить перевод. Особенно, за файл с пермишнами до которого не доходили руки.

К вашему переводу претензий почти нет, кроме пары неточностей, которые я указал.
Я бы вас всё же попросил пересмотреть некоторые строки, которые стали ощутимо длиннее исходных вариантов, так как microG часто ставят на старые устройства с маленькими экранами и информация не будет помещаться, особенно это касается текста в уведомлениях. Пробегитесь взглядом по удлиннившимся строкам и по возможности попробуйте их уменьшить без вреда для смысла.

Ну и еще не помешало бы доперевести несколько новых строк
0497f7e

И сделать rebase, а то много коммитов скопилось :-)

@frcdr
Copy link
Author

frcdr commented Jan 29, 2022

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 git clone, that is).
I had to actually spend a few days learning git properly, then I’ve done what I should’ve done from the very beginning — use git from a terminal and not through the Web GUI. I hope I’ve fixed everything this time!
That being said — please don’t be too harsh on me if it still breaks something. I’m still learning how to tame git; maybe creating a whole new PR altogether would be better?
UPD: git push --force-with-lease seemed to also finally help me get rid of like a thousand commits in log. I wish I knew this several hours ago, ugh

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants