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
ada78a5143
commit
8084d995f6
3 changed files with 10 additions and 2 deletions
|
@ -124,7 +124,7 @@ Name[uk]=Скидання графіки
|
|||
Name[vi]=Đặt lại đồ hoạ
|
||||
Name[x-test]=xxGraphics Resetxx
|
||||
Name[zh_CN]=图形功能重置
|
||||
Name[zh_TW]=圖形重置
|
||||
Name[zh_TW]=圖形重設
|
||||
Comment=A graphics reset event occurred
|
||||
Comment[ar]=حدث عملية إعادة ضبط الرسوميات
|
||||
Comment[az]=Qrafik sistemdə qəza baş verdi
|
||||
|
@ -179,7 +179,7 @@ Comment[uk]=Сталася подія відновлення початково
|
|||
Comment[vi]=Một sự kiện đặt lại đồ hoạ đã xảy ra
|
||||
Comment[x-test]=xxA graphics reset event occurredxx
|
||||
Comment[zh_CN]=发生了一次图形功能重置事件
|
||||
Comment[zh_TW]=發生了圖形重置事件
|
||||
Comment[zh_TW]=發生了圖形重設事件
|
||||
Action=Popup
|
||||
|
||||
[Event/xwaylandcrash]
|
||||
|
|
|
@ -16,10 +16,12 @@ Name[ka]=Breeze ღია
|
|||
Name[nl]=Breeze Light
|
||||
Name[pl]=Jasna Bryza
|
||||
Name[sl]=Sapica svetla
|
||||
Name[ta]=வெளிர் பிரீஸ்
|
||||
Name[tr]=Esinti Açık
|
||||
Name[uk]=Світла Breeze
|
||||
Name[x-test]=xxBreeze Lightxx
|
||||
Name[zh_CN]=Breeze 微风浅色
|
||||
Name[zh_TW]=Breeze Light
|
||||
Comment=Breeze Light by the KDE VDG
|
||||
Comment[ar]=نسيم فاتح من مجموعة تصميم كِيدِي
|
||||
Comment[bg]=Breeze Светъл от KDE VDG
|
||||
|
@ -37,7 +39,9 @@ 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[ta]=கே.டீ.யீ. VDG வழங்கும் வெளிர் பிரீஸ்
|
||||
Comment[tr]=KDE VDG tarafından Esinti Açık
|
||||
Comment[uk]=Світла Breeze, автори — KDE VDG
|
||||
Comment[x-test]=xxBreeze Light by the KDE VDGxx
|
||||
Comment[zh_CN]=Breeze 微风浅色主题,由 KDE VDG (视觉设计团队) 设计制作
|
||||
Comment[zh_TW]=由 KDE VDG 製作的 Breeze Light
|
||||
|
|
|
@ -16,10 +16,12 @@ Name[ka]=Breeze
|
|||
Name[nl]=Breeze
|
||||
Name[pl]=Bryza
|
||||
Name[sl]=Sapica
|
||||
Name[ta]=பிரீஸ்
|
||||
Name[tr]=Esinti
|
||||
Name[uk]=Breeze
|
||||
Name[x-test]=xxBreezexx
|
||||
Name[zh_CN]=Breeze 微风
|
||||
Name[zh_TW]=Breeze
|
||||
Comment=Breeze by the KDE VDG
|
||||
Comment[ar]=نسيم من مجموعة تصميم كِيدِي
|
||||
Comment[bg]=Breeze от KDE VDG
|
||||
|
@ -37,7 +39,9 @@ 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[ta]=கே.டீ.யீ. VDG வழங்கும் பிரீஸ்
|
||||
Comment[tr]=KDE VDG tarafından Esinti
|
||||
Comment[uk]=Breeze, автори — KDE VDG
|
||||
Comment[x-test]=xxBreeze by the KDE VDGxx
|
||||
Comment[zh_CN]=Breeze 微风主题,由 KDE VDG (视觉设计团队) 设计制作
|
||||
Comment[zh_TW]=由 KDE VDG 設計的 Breeze
|
||||
|
|
Loading…
Reference in a new issue