User avatar admin

Reset repository

Cacti / gpsmaps

Reset repository 2 years ago
User avatar admin

Failed merge on repository

Cacti / gpsmaps

msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
Auto-merging locales/po/lv-LV.po
CONFLICT (content): Merge conflict in locales/po/lv-LV.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 years ago
User avatar admin

Failed merge on repository

Cacti / gpsmaps

error: Your local changes to the following files would be overwritten by checkout:
	locales/po/lv-LV.po
Please commit your changes or stash them before you switch branches.
Aborting
 (1)
2 years ago
User avatar admin

Failed merge on repository

Cacti / gpsmaps

msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
Auto-merging locales/po/lv-LV.po
CONFLICT (content): Merge conflict in locales/po/lv-LV.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 years ago
User avatar admin

Failed merge on repository

Cacti / gpsmaps

error: Your local changes to the following files would be overwritten by checkout:
	locales/po/lv.po
Please commit your changes or stash them before you switch branches.
Aborting
 (1)
2 years ago
User avatar admin

Component unlocked

Cacti / gpsmaps

Component unlocked 2 years ago
User avatar None

Failed merge on repository

Cacti / gpsmaps

msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
Auto-merging locales/po/lv-LV.po
CONFLICT (content): Merge conflict in locales/po/lv-LV.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 years ago
User avatar None

Failed merge on repository

Cacti / gpsmaps

msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
  msggrep:      warning:   Locale charset "ANSI_X3.4-1968" is different from
                 input file charset "UTF-8".
                    input file charset "UTF-8".
                Output of 'msggrep' might be incorrect.
                    Output of 'msggrep' might be incorrect.
                 Possible workarounds are:
                 Possible workarounds are:
                   - Set LC_ALL to a locale with encoding UTF-8.
                 - Set LC_ALL to a locale with encoding UTF-8.
                   - Convert the translation catalog to ASCII using 'msgconv',
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then apply 'msggrep',
                     then convert back to UTF-8 using 'msgconv'.
          then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from
                  input file charset "UTF-8".
                  Output of 'msggrep' might be incorrect.
                  Possible workarounds are:
                  - Set LC_ALL to a locale with encoding UTF-8.
                  - Convert the translation catalog to ASCII using 'msgconv',
                    then apply 'msggrep',
                    then convert back to UTF-8 using 'msgconv'.
Auto-merging locales/po/lv-LV.po
CONFLICT (content): Merge conflict in locales/po/lv-LV.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 years ago
User avatar None

Component automatically locked

Cacti / gpsmaps

Component automatically locked 2 years ago
User avatar None

New alert

Cacti / gpsmaps

Could not merge the repository. 2 years ago
User avatar None

Failed rebase on repository

Cacti / gpsmaps

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Latvian)
Using index info to reconstruct a base tree...
A	locales/LC_MESSAGES/lv.mo
A	locales/po/lv.po
Falling back to patching base and 3-way merge...
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Latvian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
 (1)
2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago
User avatar Coool

New translation

Cacti / gpsmapsLatvian

2 years ago

Search