Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
  • Loading branch information
l10n daemon script committed Dec 15, 2024
1 parent f10c871 commit eff2214
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/org.kde.kbruch.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ GenericName[pl]=Ćwiczenia z ułamków
GenericName[pt]=Exercícios com Fracções
GenericName[pt_BR]=Exercícios com frações
GenericName[ru]=Упражнения с дробями
GenericName[sa]=व्यायाम अंश
GenericName[sk]=Cvičenie zlomkov
GenericName[sl]=Vaje z ulomki
GenericName[sv]=Övningar med bråk
Expand Down Expand Up @@ -124,6 +125,7 @@ Comment[pl]=Ćwiczenia z ułamków
Comment[pt]=Faça exercícios com fracções
Comment[pt_BR]=Exercícios práticos com frações
Comment[ru]=Тренировка действий с дробями
Comment[sa]=भिन्नभिः सह अभ्यासानां अभ्यासं कुर्वन्तु
Comment[sk]=Cvičenie operácií so zlomkami
Comment[sl]=Vaje računanja z ulomki
Comment[sv]=Övningar med bråk
Expand Down Expand Up @@ -194,6 +196,7 @@ Name[pt]=KBruch
Name[pt_BR]=KBruch
Name[ro]=KBruch
Name[ru]=KBruch
Name[sa]=कब्रुच्
Name[sk]=KBruch
Name[sl]=KBruch
Name[sv]=Kbruch
Expand Down

0 comments on commit eff2214

Please sign in to comment.