mirror of
https://github.com/KDE/kasts.git
synced 2025-02-03 02:37:32 +01:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
This commit is contained in:
parent
2eeb412d57
commit
68368a129f
@ -7,6 +7,7 @@ Name[en_GB]=Alligator
|
||||
Name[es]=Alligator
|
||||
Name[et]=Alligator
|
||||
Name[eu]=Alligator
|
||||
Name[fi]=Alligator
|
||||
Name[fr]=Alligator
|
||||
Name[hi]=एल्लिगेटर (Alligator)
|
||||
Name[hu]=Alligator
|
||||
@ -31,6 +32,7 @@ Comment[en_GB]=Mobile Feed Reader
|
||||
Comment[es]=Lector móvil de emisiones web
|
||||
Comment[et]=Mobiili uudistelugeja
|
||||
Comment[eu]=Mugikorrerako web-jario irakurlea
|
||||
Comment[fi]=Mobiilisyötelukija
|
||||
Comment[fr]=Lecteur nomade de fils d'actualité
|
||||
Comment[hi]=मोबाइल फ़ीड रीडर
|
||||
Comment[hu]=Mobil hírolvasó
|
||||
@ -54,6 +56,7 @@ GenericName[en_GB]=Feed Reader
|
||||
GenericName[es]=Lector de emisiones web
|
||||
GenericName[et]=Uudistelugeja
|
||||
GenericName[eu]=Web-jario irakurlea
|
||||
GenericName[fi]=Syötteenlukija
|
||||
GenericName[fr]=Lecteur de fils d'actualité
|
||||
GenericName[hi]=फ़ीड रीडर
|
||||
GenericName[hu]=Hírolvasó
|
||||
|
Loading…
x
Reference in New Issue
Block a user