Skip to content

Add Slovene language #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Apr 12, 2023
Merged

Add Slovene language #170

merged 19 commits into from
Apr 12, 2023

Conversation

pro1mantis
Copy link
Contributor

Add Slovene language and made changes that @Stypox made in #168. The branch was closed by my fault and I am weary sorry. I am still leearning how to use github, because I'm 13.

@pro1mantis
Copy link
Contributor Author

I don't no why the HEAD is included. Sorry.

@pro1mantis
Copy link
Contributor Author

pro1mantis commented Apr 6, 2023

I built an app and it shows that the language is current unsuported by Vosk for Slovenian language.
And I removed a HEAD and made git push. I don't really know how, but I somehow did that. Everythime I do git push it shows me non-fast-forward error and I am trying to fix it.

Copy link
Owner

@Stypox Stypox left a comment

Choose a reason for hiding this comment

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

Thanks! I copied from the old PR the comments that are still unresolved.

Everythime I do git push it shows me non-fast-forward error and I am trying to fix it.

When you do changes on GitHub, in order to fetch them locally you need to do "git pull". Oly after doing that will you be able to do "git push".

All of the ">>>>>> HEAD" lines were caused by a non-finished merge or rebase process. Are you using git via command line or via a GUI program?

By the way, before closing and opening a new PR, feel free to ask for help here :-). In order to solve my suggestions, you can do the following steps:

  • for the suggestions that are directly applyable, press on "Add suggestion to batch" from the "Files" tab
  • once you selected all of the suggestions you want to apply directly, press "Commit" on top-right
  • then locally do a git pull to fetch the change you just did on GitHub
  • modify the files you want to modify locally
  • git commit and git push

@pro1mantis
Copy link
Contributor Author

I am arch linux user and I use git command via terminal.

What power and square_root means?
@pro1mantis
Copy link
Contributor Author

Calculator.dslf file question: What power and square_root means?

@pro1mantis
Copy link
Contributor Author

pro1mantis commented Apr 10, 2023

I think the lyrics.dslf is okay now.

@pro1mantis pro1mantis requested a review from Stypox April 10, 2023 19:42
@Stypox Stypox changed the title Add Slovene language and made changes that @Stypox made in https://github.com/Stypox/dicio-android/pull/168 Add Slovene language Apr 11, 2023
@Stypox
Copy link
Owner

Stypox commented Apr 11, 2023

Thanks! Yeah it looks better. These are the power and square root operations. If you don't know the various ways to express those in Slovene don't worry, you can leave out those sentences. :-)

@pro1mantis
Copy link
Contributor Author

Updated those sentences. When will the pull be merged?

@pro1mantis
Copy link
Contributor Author

I translated strings with Weblate, and they are translated too. https://hosted.weblate.org/languages/sl/dicio-android/

@Stypox Stypox merged commit a82bd7e into Stypox:master Apr 12, 2023
@Stypox
Copy link
Owner

Stypox commented Apr 12, 2023

Thank you very much! I made some more changes to the sentences in af55080, let me know if they actually do make sense. You may also want to try a few sentences yourself in this debug APK (where I also integrated the weblate changes): app-debug.zip. Unfortunately at the moment Vosk does not provide a Slovenian model, so you won't be able to use Speech To Text.

I am arch linux user and I use git command via terminal.

Nice ;-)

@pro1mantis
Copy link
Contributor Author

Just one mistake is in timer.dslf. Just delete nastavip after nastavi in timer.dslf.

@pro1mantis
Copy link
Contributor Author

What about translation using weblate.

@Stypox
Copy link
Owner

Stypox commented Apr 12, 2023

Just one mistake is in timer.dslf. Just delete nastavip after nastavi in timer.dslf.

Fixed

What about translation using weblate.

As I said I merged those, too, and they are present in the debug APK I shared above

@pro1mantis
Copy link
Contributor Author

Okay.

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.

2 participants