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
42eb6389e2
commit
d5180fb91e
2 changed files with 8 additions and 0 deletions
|
@ -4,6 +4,7 @@ Name[ar]=نسيم فاتح
|
|||
Name[bg]=Breeze Светъл
|
||||
Name[ca]=Brisa clara
|
||||
Name[cs]=Breeze Světlé
|
||||
Name[en_GB]=Breeze Light
|
||||
Name[eo]=Breeze Light
|
||||
Name[es]=Brisa claro
|
||||
Name[eu]=Breeze argia
|
||||
|
@ -13,6 +14,7 @@ Name[hu]=Breeze Light
|
|||
Name[ia]=Breeze Light (Brisa Ligier)
|
||||
Name[ka]=Breeze ღია
|
||||
Name[nl]=Breeze Light
|
||||
Name[pl]=Jasna Bryza
|
||||
Name[sl]=Sapica svetla
|
||||
Name[tr]=Esinti Açık
|
||||
Name[uk]=Світла Breeze
|
||||
|
@ -23,6 +25,7 @@ Comment[ar]=نسيم فاتح من مجموعة تصميم كِيدِي
|
|||
Comment[bg]=Breeze Светъл от KDE VDG
|
||||
Comment[ca]=Brisa clara, creat pel VDG del KDE
|
||||
Comment[cs]=Breeze Light od KDE VDG
|
||||
Comment[en_GB]=Breeze Light by the KDE VDG
|
||||
Comment[eo]=Brizo Leĝera de la KDE VDG
|
||||
Comment[es]=Brisa claro, por KDE VDG
|
||||
Comment[eu]=Breeze argia, KDE VDGk egina
|
||||
|
@ -32,6 +35,7 @@ Comment[hu]=Breeze Light a KDE VDG-től
|
|||
Comment[ia]=Breeze (Brisa) Ligier per KDE VDG
|
||||
Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან
|
||||
Comment[nl]=Breeze Light door de KDE VDG
|
||||
Comment[pl]=Jasna Bryza autorstwa KDE VDG
|
||||
Comment[sl]=Sapica svetla od KDE VDG
|
||||
Comment[tr]=KDE VDG tarafından Esinti Açık
|
||||
Comment[uk]=Світла Breeze, автори — KDE VDG
|
||||
|
|
|
@ -4,6 +4,7 @@ Name[ar]=نسيم
|
|||
Name[bg]=Breeze
|
||||
Name[ca]=Brisa
|
||||
Name[cs]=Breeze
|
||||
Name[en_GB]=Breeze
|
||||
Name[eo]=Breeze
|
||||
Name[es]=Brisa
|
||||
Name[eu]=Breeze (Brisa)
|
||||
|
@ -13,6 +14,7 @@ Name[hu]=Breeze
|
|||
Name[ia]=Breeze(Brisa)
|
||||
Name[ka]=Breeze
|
||||
Name[nl]=Breeze
|
||||
Name[pl]=Bryza
|
||||
Name[sl]=Sapica
|
||||
Name[tr]=Esinti
|
||||
Name[uk]=Breeze
|
||||
|
@ -23,6 +25,7 @@ Comment[ar]=نسيم من مجموعة تصميم كِيدِي
|
|||
Comment[bg]=Breeze от KDE VDG
|
||||
Comment[ca]=Brisa, creat pel VDG del KDE
|
||||
Comment[cs]=Breeze od KDE VDG
|
||||
Comment[en_GB]=Breeze by the KDE VDG
|
||||
Comment[eo]=Brizo de la KDE VDG
|
||||
Comment[es]=Brisa, por KDE VDG
|
||||
Comment[eu]=Breeze, KDE VDGk egina
|
||||
|
@ -32,6 +35,7 @@ Comment[hu]=Breeze a KDE VDG-től
|
|||
Comment[ia]=Breeze (Brisa) per le KDE VDG
|
||||
Comment[ka]=Breeze KDE VDG-სგან
|
||||
Comment[nl]=Breeze door de KDE VDG
|
||||
Comment[pl]=Bryza autorstwa KDE VDG
|
||||
Comment[sl]=Sapica od KDE VDG
|
||||
Comment[tr]=KDE VDG tarafından Esinti
|
||||
Comment[uk]=Breeze, автори — KDE VDG
|
||||
|
|
Loading…
Reference in a new issue