Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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:
l10n daemon script 2020-09-28 06:13:07 +02:00
parent 5b733086ec
commit 29d9cec5ce
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.kde.alligator.desktop
View File

@ -3,6 +3,7 @@ Name=Alligator
Name[ca]=Alligator Name[ca]=Alligator
Name[ca@valencia]=Alligator Name[ca@valencia]=Alligator
Name[cs]=Alligator Name[cs]=Alligator
Name[en_GB]=Alligator
Name[es]=Alligator Name[es]=Alligator
Name[et]=Alligator Name[et]=Alligator
Name[eu]=Alligator Name[eu]=Alligator
@ -25,6 +26,7 @@ Comment=Mobile Feed Reader
Comment[ca]=Lector de fonts per al mòbil Comment[ca]=Lector de fonts per al mòbil
Comment[ca@valencia]=Lector de fonts per al mòbil Comment[ca@valencia]=Lector de fonts per al mòbil
Comment[cs]=Mobilní čtečka kanálů Comment[cs]=Mobilní čtečka kanálů
Comment[en_GB]=Mobile Feed Reader
Comment[es]=Lector móvil de emisiones web Comment[es]=Lector móvil de emisiones web
Comment[et]=Mobiili uudistelugeja Comment[et]=Mobiili uudistelugeja
Comment[eu]=Mugikorrerako web-jario irakurlea Comment[eu]=Mugikorrerako web-jario irakurlea
@ -46,6 +48,7 @@ GenericName=Feed Reader
GenericName[ca]=Lector de fonts GenericName[ca]=Lector de fonts
GenericName[ca@valencia]=Lector de fonts GenericName[ca@valencia]=Lector de fonts
GenericName[cs]=Čtečka kanálů GenericName[cs]=Čtečka kanálů
GenericName[en_GB]=Feed Reader
GenericName[es]=Lector de emisiones web GenericName[es]=Lector de emisiones web
GenericName[et]=Uudistelugeja GenericName[et]=Uudistelugeja
GenericName[eu]=Web-jario irakurlea GenericName[eu]=Web-jario irakurlea