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:
l10n daemon script 2024-01-05 02:08:21 +00:00
parent d2b0ff050c
commit bba776a5fb
33 changed files with 67 additions and 33 deletions

View file

@ -38,7 +38,8 @@
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
"Name[zh_CN]": "Marco Martin",
"Name[zh_TW]": "Marco Martin"
}
],
"Category": "Containments",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Category": "Containments",

View file

@ -38,7 +38,8 @@
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
"Name[zh_CN]": "Marco Martin",
"Name[zh_TW]": "Marco Martin"
}
],
"Category": "Containments",

View file

@ -38,7 +38,8 @@
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
"Name[zh_CN]": "Marco Martin",
"Name[zh_TW]": "Marco Martin"
}
],
"Category": "Containments",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Cellular initialstart module for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Finished initialstart module for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Prepare initialstart module for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Time initialstart module for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "WiFi initialstart module for Plasma Mobile",

View file

@ -29,7 +29,8 @@
"Name[tr]": "Tobias Fella",
"Name[uk]": "Tobias Fella",
"Name[x-test]": "xxTobias Fellaxx",
"Name[zh_CN]": "Tobias Fella"
"Name[zh_CN]": "Tobias Fella",
"Name[zh_TW]": "Tobias Fella"
}
],
"Category": "System Information",

View file

@ -36,7 +36,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Category": "System Information",

View file

@ -36,7 +36,8 @@
"Name[tr]": "Buşan Şah",
"Name[uk]": "Bhushan Shah",
"Name[x-test]": "xxBhushan Shahxx",
"Name[zh_CN]": "Bhushan Shah"
"Name[zh_CN]": "Bhushan Shah",
"Name[zh_TW]": "Bhushan Shah"
}
],
"Description": "On-Screen Keyboard configuration",

View file

@ -30,7 +30,8 @@
"Name[tr]": "Plata Hill",
"Name[uk]": "Plata Hill",
"Name[x-test]": "xxPlata Hillxx",
"Name[zh_CN]": "Plata Hill"
"Name[zh_CN]": "Plata Hill",
"Name[zh_TW]": "Plata Hill"
}
],
"Description": "Removes window decorations and maximizes windows on the first screen only.",

View file

@ -31,7 +31,8 @@
"Name[tr]": "KDE Görsel Tasarım Grubu",
"Name[uk]": "Група з візуального дизайну KDE",
"Name[x-test]": "xxKDE Visual Design Groupxx",
"Name[zh_CN]": "KDE 视觉设计团队"
"Name[zh_CN]": "KDE 视觉设计团队",
"Name[zh_TW]": "KDE VDG 視覺設計組"
}
],
"Category": "",
@ -93,6 +94,7 @@
"Name[uk]": "Breeze для мобільної Плазми",
"Name[x-test]": "xxPlasma Mobile Breezexx",
"Name[zh_CN]": "Plasma Mobile Breeze 微风",
"Name[zh_TW]": "Plasma 行動 Breeze",
"Website": "https://www.kde.org"
},
"Keywords": "Phone;Mobile;Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",

View file

@ -38,7 +38,8 @@
"Name[tr]": "Buşan Şah",
"Name[uk]": "Bhushan Shah",
"Name[x-test]": "xxBhushan Shahxx",
"Name[zh_CN]": "Bhushan Shah"
"Name[zh_CN]": "Bhushan Shah",
"Name[zh_TW]": "Bhushan Shah"
}
],
"Description": "Airplane mode quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Audio quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Battery quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Bluetooth quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Quick setting to suspend system sleep for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Quick setting to toggle docked mode for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Quick setting to toggle do not disturb mode for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Flashlight quick setting for Plasma Mobile",

View file

@ -29,7 +29,8 @@
"Name[tr]": "Yari Polla",
"Name[uk]": "Yari Polla",
"Name[x-test]": "xxYari Pollaxx",
"Name[zh_CN]": "Yari Polla"
"Name[zh_CN]": "Yari Polla",
"Name[zh_TW]": "Yari Polla"
}
],
"Description": "Hotspot quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Quick setting for keyboard toggle for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Location quick setting for Plasma Mobile",

View file

@ -38,7 +38,8 @@
"Name[tr]": "Aleix Pol",
"Name[uk]": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx",
"Name[zh_CN]": "Aleix Pol"
"Name[zh_CN]": "Aleix Pol",
"Name[zh_TW]": "Aleix Pol"
}
],
"Description": "Night color quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Power menu quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Aleix Pol i Gonzalez",
"Name[uk]": "Aleix Pol i Gonzalez",
"Name[x-test]": "xxAleix Pol i Gonzalezxx",
"Name[zh_CN]": "Aleix Pol i Gonzalez"
"Name[zh_CN]": "Aleix Pol i Gonzalez",
"Name[zh_TW]": "Aleix Pol i Gonzalez"
}
],
"Description": "Screen recording quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Screen rotation quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Screenshot quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Settings application quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Description": "Wi-Fi quick setting for Plasma Mobile",

View file

@ -37,7 +37,8 @@
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Category": "",