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
773d8c61b1
commit
b3776cef5b
22 changed files with 21 additions and 99 deletions
|
@ -42,45 +42,7 @@
|
|||
"EnabledByDefault": true,
|
||||
"Id": "contrast",
|
||||
"License": "GPL",
|
||||
"Name": "Background Contrast",
|
||||
"Name[ar]": "تباين الخلفية",
|
||||
"Name[az]": "Fon kontrastı",
|
||||
"Name[be]": "Кантраснасць фону",
|
||||
"Name[bg]": "Контраст на фона",
|
||||
"Name[ca@valencia]": "Contrast del fons",
|
||||
"Name[ca]": "Contrast del fons",
|
||||
"Name[cs]": "Kontrast pozadí",
|
||||
"Name[de]": "Hintergrundkontrast",
|
||||
"Name[en_GB]": "Background contrast",
|
||||
"Name[es]": "Contraste del fondo",
|
||||
"Name[et]": "Tausta kontrast",
|
||||
"Name[eu]": "Atzeko planoaren kontrastea",
|
||||
"Name[fi]": "Taustakontrasti",
|
||||
"Name[fr]": "Contraste de l'arrière-plan",
|
||||
"Name[hu]": "Háttérkontraszt",
|
||||
"Name[ia]": "Contrasto de fundo",
|
||||
"Name[id]": "Latarbelakang kontras",
|
||||
"Name[it]": "Contrasto dello sfondo",
|
||||
"Name[ja]": "背景のコントラスト",
|
||||
"Name[ka]": "ფონის კონტრასტი",
|
||||
"Name[ko]": "배경 명암",
|
||||
"Name[nl]": "Contrast in achtergrond",
|
||||
"Name[nn]": "Bakgrunnskontrast",
|
||||
"Name[pl]": "Kontrast tła",
|
||||
"Name[pt]": "Contraste do fundo",
|
||||
"Name[pt_BR]": "Contraste do plano de fundo",
|
||||
"Name[ro]": "Contrast de fundal",
|
||||
"Name[ru]": "Контрастность фона",
|
||||
"Name[sk]": "Kontrast pozadia",
|
||||
"Name[sl]": "Kontrast ozadja",
|
||||
"Name[sv]": "Bakgrundskontrast",
|
||||
"Name[ta]": "பின்புல நிறமாறுபாடு",
|
||||
"Name[tr]": "Arka plan karşıtlığı",
|
||||
"Name[uk]": "Контрастність тла",
|
||||
"Name[vi]": "Tương phản nền",
|
||||
"Name[x-test]": "xxBackground contrastxx",
|
||||
"Name[zh_CN]": "背景对比度增强",
|
||||
"Name[zh_TW]": "背景對比"
|
||||
"Name": "Background Contrast"
|
||||
},
|
||||
"org.kde.kwin.effect": {
|
||||
"enabledByDefaultMethod": true
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Rivo Laks, Martin Gräßlin",
|
||||
"Name[pl]": "Rivo Laks, Martin Gräßlin",
|
||||
"Name[pt]": "Rivo Laks, Martin Gräßlin",
|
||||
"Name[ru]": "Rivo Laks, Martin Gräßlin",
|
||||
"Name[sl]": "Rivo Laks, Martin Gräßlin",
|
||||
"Name[ta]": "ரிவோ லாக்சு, மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Rivo Laks, Martin Gräßlin",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Flöser, Vlad Zahorodnii",
|
||||
"Name[pl]": "Martin Flöser, Vlad Zahorodnii",
|
||||
"Name[pt]": "Martin Flöser, Vlad Zahorodnii",
|
||||
"Name[ru]": "Martin Flöser, Влад Загородний",
|
||||
"Name[sl]": "Martin Flöser, Vlad Zahorodnii",
|
||||
"Name[ta]": "மார்ட்டின் ஃபுலோசர், விலாட் ஜாஹொரிடுனி",
|
||||
"Name[tr]": "Martin Flöser, Vlad Zahorodnii",
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
"Name[nl]": "Thomas Lübking",
|
||||
"Name[pl]": "Thomas Lübking",
|
||||
"Name[pt]": "Thomas Lübking",
|
||||
"Name[ru]": "Thomas Lübking",
|
||||
"Name[sl]": "Thomas Lübking",
|
||||
"Name[ta]": "தாமஸ் லுபுகிங்",
|
||||
"Name[tr]": "Thomas Lübking",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Philip Falkner, Martin Gräßlin",
|
||||
"Name[pl]": "Philip Falkner, Martin Gräßlin",
|
||||
"Name[pt]": "Philip Falkner, Martin Gräßlin",
|
||||
"Name[ru]": "Philip Falkner, Martin Gräßlin",
|
||||
"Name[sl]": "Philip Falkner, Martin Gräßlin",
|
||||
"Name[ta]": "ஃபிலிப்பு ஃபால்குனர், மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Philip Falkner, Martin Gräßlin",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Lucas Murray, Martin Gräßlin",
|
||||
"Name[pl]": "Lucas Murray, Martin Gräßlin",
|
||||
"Name[pt]": "Lucas Murray, Martin Gräßlin",
|
||||
"Name[ru]": "Lucas Murray, Martin Gräßlin",
|
||||
"Name[sl]": "Lucas Murray, Martin Gräßlin",
|
||||
"Name[ta]": "லூக்கஸ் முரே, மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Lucas Murray, Martin Gräßlin",
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
"Name[nl]": "Kai Uwe Broulik",
|
||||
"Name[pl]": "Kai Uwe Broulik",
|
||||
"Name[pt]": "Kai Uwe Broulik",
|
||||
"Name[ru]": "Kai Uwe Broulik",
|
||||
"Name[sl]": "Kai Uwe Broulik",
|
||||
"Name[ta]": "காய் ஊவே புரோலிக்",
|
||||
"Name[tr]": "Kai Uwe Broulik",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Gräßlin",
|
||||
"Name[pl]": "Martin Gräßlin",
|
||||
"Name[pt]": "Martin Gräßlin",
|
||||
"Name[ru]": "Martin Gräßlin",
|
||||
"Name[sl]": "Martin Gräßlin",
|
||||
"Name[ta]": "மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Martin Gräßlin",
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
"Name[nl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
|
||||
"Name[pl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
|
||||
"Name[pt]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
|
||||
"Name[ru]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
|
||||
"Name[sl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
|
||||
"Name[ta]": "லூபோசு லுனாக்கு, காய் ஊவே புரோலிக்கு, மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
"Name[nl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
|
||||
"Name[pl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
|
||||
"Name[pt]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
|
||||
"Name[ru]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
|
||||
"Name[sl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
|
||||
"Name[ta]": "லூபோசு லுனாக்கு, காய் ஊவே புரோலிக்கு, மார்ட்டின் கிராஸ்லின், மார்க்கோ மார்ட்டின்",
|
||||
"Name[tr]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Gräßlin",
|
||||
"Name[pl]": "Martin Gräßlin",
|
||||
"Name[pt]": "Martin Gräßlin",
|
||||
"Name[ru]": "Martin Gräßlin",
|
||||
"Name[sl]": "Martin Gräßlin",
|
||||
"Name[ta]": "மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Martin Gräßlin",
|
||||
|
|
|
@ -74,28 +74,6 @@
|
|||
"Id": "kwin4_effect_morphingpopups",
|
||||
"License": "GPL",
|
||||
"Name": "Morphing Popups",
|
||||
"Name[ar]": "المنبثقات المتحورة",
|
||||
"Name[be]": "Трансфармаванне выплыўных акон",
|
||||
"Name[bg]": "Променящи се изскачащи прозорци",
|
||||
"Name[ca@valencia]": "Missatges emergents en metamorfosi",
|
||||
"Name[ca]": "Missatges emergents en metamorfosi",
|
||||
"Name[en_GB]": "Morphing popups",
|
||||
"Name[es]": "Transformación de ventanas emergentes",
|
||||
"Name[et]": "Moonduvad hüpikdialoogid",
|
||||
"Name[eu]": "Eraldatzen diren gainerakorrak",
|
||||
"Name[fr]": "Effectuer un fondu enchaîné des infobulles",
|
||||
"Name[ia]": "Popups de Morphing",
|
||||
"Name[it]": "Finestre a comparsa che si trasformano",
|
||||
"Name[ka]": "ტრანსფორმირებადი მხტუნარები",
|
||||
"Name[nl]": "Morphing popups",
|
||||
"Name[pl]": "Zmiennokształtne elementy pomocnicze",
|
||||
"Name[pt]": "Janelas mutantes",
|
||||
"Name[sl]": "Morfani pojavni gradniki",
|
||||
"Name[ta]": "தெரித்தெழுபவை திரிவது",
|
||||
"Name[tr]": "Dönüşen açılır pencereler",
|
||||
"Name[uk]": "Аморфні контекстні панелі",
|
||||
"Name[vi]": "Ô bật lên biến dạng",
|
||||
"Name[x-test]": "xxMorphing popupsxx",
|
||||
"Version": "1",
|
||||
"Website": ""
|
||||
},
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
"Name[nl]": "David Edmundson",
|
||||
"Name[pl]": "David Edmundson",
|
||||
"Name[pt]": "David Edmundson",
|
||||
"Name[ru]": "David Edmundson",
|
||||
"Name[sl]": "David Edmundson",
|
||||
"Name[ta]": "டேவிட் எட்மண்டுஸன்",
|
||||
"Name[tr]": "David Edmundson",
|
||||
|
|
|
@ -42,44 +42,7 @@
|
|||
"EnabledByDefault": true,
|
||||
"Id": "slidingpopups",
|
||||
"License": "GPL",
|
||||
"Name": "Sliding Popups",
|
||||
"Name[ar]": "تمرير المنبثقات",
|
||||
"Name[az]": "Ani pəncərə animasiyası",
|
||||
"Name[be]": "Высоўныя выплыўныя вокны",
|
||||
"Name[bg]": "Плъзгащи се изскачащи прозорци",
|
||||
"Name[ca@valencia]": "Missatges emergents desplaçant-se",
|
||||
"Name[ca]": "Missatges emergents desplaçant-se",
|
||||
"Name[cs]": "Klouzající vyskakovací okna",
|
||||
"Name[de]": "Hereingleitende Aufklappfenster",
|
||||
"Name[en_GB]": "Sliding popups",
|
||||
"Name[es]": "Deslizar ventanas emergentes",
|
||||
"Name[et]": "Liuguvad hüpikdialoogid",
|
||||
"Name[eu]": "Gainerakor irristalariak",
|
||||
"Name[fi]": "Ponnahdusikkunaliuku",
|
||||
"Name[fr]": "Annotations glissantes",
|
||||
"Name[hu]": "Csúszó felugró ablakok",
|
||||
"Name[ia]": "Popups glissante",
|
||||
"Name[id]": "Sliding popups",
|
||||
"Name[it]": "Finestre a comparsa che scivolano",
|
||||
"Name[ja]": "スライドするポップアップ",
|
||||
"Name[ka]": "მცურავი მხტუნარები",
|
||||
"Name[ko]": "미끄러지는 팝업",
|
||||
"Name[nl]": "Schuivende popups",
|
||||
"Name[nn]": "Glidande sprettoppvindauge",
|
||||
"Name[pl]": "Wysuwanie paneli",
|
||||
"Name[pt]": "Janelas deslizantes",
|
||||
"Name[pt_BR]": "Mensagens instantâneas deslizantes",
|
||||
"Name[ro]": "Indicii lunecoase",
|
||||
"Name[ru]": "Анимация всплывающих окон",
|
||||
"Name[sk]": "Vysúvať vyskakovacie okná",
|
||||
"Name[sl]": "Drsni pojavi",
|
||||
"Name[sv]": "Glidande rutor",
|
||||
"Name[tr]": "Kayan Açılır Pencereler",
|
||||
"Name[uk]": "Ковзні контекстні вікна",
|
||||
"Name[vi]": "Ô bật lên dạng trượt",
|
||||
"Name[x-test]": "xxSliding popupsxx",
|
||||
"Name[zh_CN]": "气泡滑动动效",
|
||||
"Name[zh_TW]": "滑動的彈出視窗"
|
||||
"Name": "Sliding Popups"
|
||||
},
|
||||
"org.kde.kwin.effect": {
|
||||
"video": "https://files.kde.org/plasma/kwin/effect-videos/sliding_popups.mp4"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Rivo Laks, Vlad Zahorodnii",
|
||||
"Name[pl]": "Rivo Laks, Vlad Zahorodnii",
|
||||
"Name[pt]": "Rivo Laks, Vlad Zahorodnii",
|
||||
"Name[ru]": "Rivo Laks, Влад Загородний",
|
||||
"Name[sl]": "Rivo Laks, Vlad Zahorodnii",
|
||||
"Name[ta]": "ரிவோ லாக்சு, விலாட் ஜாஹொரிடுனி",
|
||||
"Name[tr]": "Rivo Laks, Vlad Zahorodnii",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Luboš Luňák, Martin Gräßlin",
|
||||
"Name[pl]": "Luboš Luňák, Martin Gräßlin",
|
||||
"Name[pt]": "Luboš Luňák, Martin Gräßlin",
|
||||
"Name[ru]": "Luboš Luňák, Martin Gräßlin",
|
||||
"Name[sl]": "Luboš Luňák, Martin Gräßlin",
|
||||
"Name[ta]": "லூபொசு லுனாக்கு, மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Luboš Luňák, Martin Gräßlin",
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
"Name[nl]": "Thomas Lübking",
|
||||
"Name[pl]": "Thomas Lübking",
|
||||
"Name[pt]": "Thomas Lübking",
|
||||
"Name[ru]": "Thomas Lübking",
|
||||
"Name[sl]": "Thomas Lübking",
|
||||
"Name[ta]": "தாமஸ் லுபுகிங்",
|
||||
"Name[tr]": "Thomas Lübking",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Gräßlin",
|
||||
"Name[pl]": "Martin Gräßlin",
|
||||
"Name[pt]": "Martin Gräßlin",
|
||||
"Name[ru]": "Martin Gräßlin",
|
||||
"Name[sl]": "Martin Gräßlin",
|
||||
"Name[ta]": "மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Martin Gräßlin",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Gräßlin",
|
||||
"Name[pl]": "Martin Gräßlin",
|
||||
"Name[pt]": "Martin Gräßlin",
|
||||
"Name[ru]": "Martin Gräßlin",
|
||||
"Name[sl]": "Martin Gräßlin",
|
||||
"Name[ta]": "மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Martin Gräßlin",
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
"Name[nl]": "Thomas Lübking",
|
||||
"Name[pl]": "Thomas Lübking",
|
||||
"Name[pt]": "Thomas Lübking",
|
||||
"Name[ru]": "Thomas Lübking",
|
||||
"Name[sl]": "Thomas Lübking",
|
||||
"Name[ta]": "தாமஸ் லுபுகிங்",
|
||||
"Name[tr]": "Thomas Lübking",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Gräßlin",
|
||||
"Name[pl]": "Martin Gräßlin",
|
||||
"Name[pt]": "Martin Gräßlin",
|
||||
"Name[ru]": "Martin Gräßlin",
|
||||
"Name[sl]": "Martin Gräßlin",
|
||||
"Name[ta]": "மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Martin Gräßlin",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
"Name[nl]": "Martin Gräßlin",
|
||||
"Name[pl]": "Martin Gräßlin",
|
||||
"Name[pt]": "Martin Gräßlin",
|
||||
"Name[ru]": "Martin Gräßlin",
|
||||
"Name[sl]": "Martin Gräßlin",
|
||||
"Name[ta]": "மார்ட்டின் கிராஸ்லின்",
|
||||
"Name[tr]": "Martin Gräßlin",
|
||||
|
|
Loading…
Reference in a new issue