mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 22:59:45 -09: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
f681d5346b
commit
2cad522ad9
12 changed files with 26 additions and 0 deletions
|
|
@ -334,6 +334,7 @@ Name[mai]=प्रकार
|
|||
Name[mk]=Тип
|
||||
Name[ml]=തരം
|
||||
Name[mr]=प्रकार
|
||||
Name[nan_TW@latin]=Luī
|
||||
Name[nb]=Type
|
||||
Name[nds]=Typ
|
||||
Name[nl]=Type
|
||||
|
|
@ -410,6 +411,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ Name[lv]=Ierīce
|
|||
Name[mk]=Уред
|
||||
Name[ml]=ഉപകരണം
|
||||
Name[mr]=साधन
|
||||
Name[nan_TW@latin]=Tsong-tì
|
||||
Name[nb]=Enhet
|
||||
Name[nds]=Reedschap
|
||||
Name[nl]=Apparaat
|
||||
|
|
@ -270,6 +271,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ Name[lv]=Atbalstītie protokoli
|
|||
Name[mk]=Поддржани протоколи
|
||||
Name[ml]=പിന്തുണയ്ക്കുന്ന സമ്പ്രദായങ്ങള്
|
||||
Name[mr]=समर्थीत शिष्टाचार
|
||||
Name[nan_TW@latin]=Tsi-uān ê Hia̍p-tīng
|
||||
Name[nb]=Støttede protokoller
|
||||
Name[nds]=Ünnerstütt Protokollen
|
||||
Name[nl]=Ondersteunde protocollen
|
||||
|
|
@ -196,6 +197,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -733,6 +733,7 @@ Name[lv]=Izmērs
|
|||
Name[mk]=Големина
|
||||
Name[ml]=വലിപ്പം
|
||||
Name[mr]=आकार
|
||||
Name[nan_TW@latin]=Tuā-sè
|
||||
Name[nb]=Størrelse
|
||||
Name[nds]=Grött
|
||||
Name[nl]=Grootte
|
||||
|
|
@ -810,6 +811,7 @@ Name[lv]=Izlietojums
|
|||
Name[mk]=Користење
|
||||
Name[ml]=ഉപയോഗരീതി
|
||||
Name[mr]=वापर
|
||||
Name[nan_TW@latin]=Sú-iōng-lu̍t
|
||||
Name[nb]=Bruk
|
||||
Name[nds]=Bruuk
|
||||
Name[nl]=Gebruik
|
||||
|
|
@ -887,6 +889,7 @@ Name[lv]=UUID
|
|||
Name[mk]=Uuid
|
||||
Name[ml]=യുയുഐഡി
|
||||
Name[mr]=Uuid
|
||||
Name[nan_TW@latin]=UUID
|
||||
Name[nb]=UUID
|
||||
Name[nds]=UUID
|
||||
Name[nl]=Uuid
|
||||
|
|
@ -963,6 +966,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -424,6 +424,7 @@ Name[lv]=Izmērs
|
|||
Name[mk]=Големина
|
||||
Name[ml]=വലിപ്പം
|
||||
Name[mr]=आकार
|
||||
Name[nan_TW@latin]=Tuā-sè
|
||||
Name[nb]=Størrelse
|
||||
Name[nds]=Grött
|
||||
Name[nl]=Grootte
|
||||
|
|
@ -731,6 +732,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ Name[lv]=Atbalstītie protokoli
|
|||
Name[mk]=Поддржани протоколи
|
||||
Name[ml]=പിന്തുണയ്ക്കുന്ന സമ്പ്രദായങ്ങള്
|
||||
Name[mr]=समर्थीत शिष्टाचार
|
||||
Name[nan_TW@latin]=Tsi-uān ê Hia̍p-tīng
|
||||
Name[nb]=Støttede protokoller
|
||||
Name[nds]=Ünnerstütt Protokollen
|
||||
Name[nl]=Ondersteunde protocollen
|
||||
|
|
@ -196,6 +197,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -341,6 +341,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ Name[lv]=Datnes ceļš
|
|||
Name[mk]=Патека на датотека
|
||||
Name[ml]=ഫയല് വഴി
|
||||
Name[mr]=फाईलचा मार्ग
|
||||
Name[nan_TW@latin]=Tóng-àn Lōo-kìng
|
||||
Name[nb]=Filadresse
|
||||
Name[nds]=Dateipadd
|
||||
Name[nl]=Bestandspad
|
||||
|
|
@ -197,6 +198,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -348,6 +348,7 @@ Name[lv]=Izmērs
|
|||
Name[mk]=Големина
|
||||
Name[ml]=വലിപ്പം
|
||||
Name[mr]=आकार
|
||||
Name[nan_TW@latin]=Tuā-sè
|
||||
Name[nb]=Størrelse
|
||||
Name[nds]=Grött
|
||||
Name[nl]=Grootte
|
||||
|
|
@ -424,6 +425,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -274,6 +274,7 @@ Name[lv]=Izmērs
|
|||
Name[mk]=Големина
|
||||
Name[ml]=വലിപ്പം
|
||||
Name[mr]=आकार
|
||||
Name[nan_TW@latin]=Tuā-sè
|
||||
Name[nb]=Størrelse
|
||||
Name[nds]=Grött
|
||||
Name[nl]=Grootte
|
||||
|
|
@ -351,6 +352,7 @@ Name[lv]=Izlietojums
|
|||
Name[mk]=Користење
|
||||
Name[ml]=ഉപയോഗരീതി
|
||||
Name[mr]=वापर
|
||||
Name[nan_TW@latin]=Sú-iōng-lu̍t
|
||||
Name[nb]=Bruk
|
||||
Name[nds]=Bruuk
|
||||
Name[nl]=Gebruik
|
||||
|
|
@ -428,6 +430,7 @@ Name[lv]=UUID
|
|||
Name[mk]=Uuid
|
||||
Name[ml]=യുയുഐഡി
|
||||
Name[mr]=Uuid
|
||||
Name[nan_TW@latin]=UUID
|
||||
Name[nb]=UUID
|
||||
Name[nds]=UUID
|
||||
Name[nl]=Uuid
|
||||
|
|
@ -504,6 +507,7 @@ Name[lv]=„Solid“ ierīce
|
|||
Name[mk]=Полупроводнички уред
|
||||
Name[ml]=സോളിഡ് ഉപകരണം
|
||||
Name[mr]=सॉलिड साधन
|
||||
Name[nan_TW@latin]=Solid Tsong-tì
|
||||
Name[nb]=Solid-enhet
|
||||
Name[nds]=Solid-Reedschap
|
||||
Name[nl]=Solid-apparaat
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ Name[ka]=Breeze
|
|||
Name[ko]=Breeze
|
||||
Name[lt]=Breeze
|
||||
Name[lv]=Breeze
|
||||
Name[nan_TW@latin]=Breeze
|
||||
Name[nb]=Breeze
|
||||
Name[nl]=Breeze
|
||||
Name[nn]=Breeze
|
||||
|
|
@ -76,6 +77,7 @@ Description[ka]=Breeze
|
|||
Description[ko]=Breeze
|
||||
Description[lt]=Breeze
|
||||
Description[lv]=Breeze
|
||||
Description[nan_TW@latin]=Breeze
|
||||
Description[nb]=Breeze
|
||||
Description[nl]=Breeze
|
||||
Description[nn]=Breeze
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ Name[ko]=패널 도구 상자
|
|||
Name[lt]=Skydelio priemonių komplektas
|
||||
Name[lv]=Paneļa rīkkaste
|
||||
Name[mr]=पटल साधने
|
||||
Name[nan_TW@latin]=Bīn-pán kang-khū-siunn
|
||||
Name[nb]=Panelverktøykasse
|
||||
Name[nds]=Paneel-Warktüüchkist
|
||||
Name[nl]=Paneelhulpmiddelen
|
||||
|
|
|
|||
Loading…
Reference in a new issue