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 2023-12-10 01:17:24 +00:00
parent 984d5a959e
commit 7cc0249ecd
14 changed files with 32 additions and 13 deletions

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Category": "System Information", "Category": "System Information",
@ -68,6 +69,7 @@
"Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»", "Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»",
"Description[x-test]": "xxShow notifications from your devices using KDE Connectxx", "Description[x-test]": "xxShow notifications from your devices using KDE Connectxx",
"Description[zh_CN]": "通过 KDE Connect 显示来自其他设备的通知", "Description[zh_CN]": "通过 KDE Connect 显示来自其他设备的通知",
"Description[zh_TW]": "使用 KDE 連線顯示來自您的裝置的通知",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "kdeconnect", "Icon": "kdeconnect",
"Id": "org.kde.kdeconnect", "Id": "org.kde.kdeconnect",

View file

@ -36,7 +36,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Category": "System Information", "Category": "System Information",
@ -69,6 +70,7 @@
"Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»", "Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»",
"Description[x-test]": "xxShow notifications from your devices using KDE Connectxx", "Description[x-test]": "xxShow notifications from your devices using KDE Connectxx",
"Description[zh_CN]": "通过 KDE Connect 显示来自其他设备的通知", "Description[zh_CN]": "通过 KDE Connect 显示来自其他设备的通知",
"Description[zh_TW]": "使用 KDE 連線顯示來自您的裝置的通知",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "kdeconnect", "Icon": "kdeconnect",
"Id": "org.kde.kdeconnect", "Id": "org.kde.kdeconnect",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Show your phone battery next to your computer battery", "Description": "Show your phone battery next to your computer battery",

View file

@ -81,6 +81,7 @@
"Description[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen", "Description[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen",
"Description[x-test]": "xxSend voice commands to your TV running Plasma Bigscreenxx", "Description[x-test]": "xxSend voice commands to your TV running Plasma Bigscreenxx",
"Description[zh_CN]": "发送语音命令给运行 Plasma Bigscreen 的电视机", "Description[zh_CN]": "发送语音命令给运行 Plasma Bigscreen 的电视机",
"Description[zh_TW]": "傳送人聲指令到您執行 Plasma 大螢幕的電視",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "tvtrusted", "Icon": "tvtrusted",
"License": "GPL", "License": "GPL",
@ -115,7 +116,8 @@
"Name[tr]": "Büyük Ekran sesle denetim", "Name[tr]": "Büyük Ekran sesle denetim",
"Name[uk]": "Голосове керування Bigscreen", "Name[uk]": "Голосове керування Bigscreen",
"Name[x-test]": "xxBigscreen voice controlxx", "Name[x-test]": "xxBigscreen voice controlxx",
"Name[zh_CN]": "Bigscreen 语音控制" "Name[zh_CN]": "Bigscreen 语音控制",
"Name[zh_TW]": "大螢幕人聲控制"
}, },
"X-KdeConnect-OutgoingPacketType": [ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.mousepad.request", "kdeconnect.mousepad.request",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Share the clipboard between devices", "Description": "Share the clipboard between devices",

View file

@ -914,6 +914,7 @@ Name[tr]=Metin Alındı
Name[uk]=Отримано текст Name[uk]=Отримано текст
Name[x-test]=xxText Receivedxx Name[x-test]=xxText Receivedxx
Name[zh_CN]=收到文本 Name[zh_CN]=收到文本
Name[zh_TW]=收到簡訊
Comment=Received some text Comment=Received some text
Comment[ar]=وصل نص إلى الجهاز Comment[ar]=وصل نص إلى الجهاز
Comment[az]=Bəzi mətnlər alındı Comment[az]=Bəzi mətnlər alındı
@ -946,5 +947,6 @@ Comment[tr]=Metin alındı
Comment[uk]=Отримано якийсь текст Comment[uk]=Отримано якийсь текст
Comment[x-test]=xxReceived some textxx Comment[x-test]=xxReceived some textxx
Comment[zh_CN]=收到文本 Comment[zh_CN]=收到文本
Comment[zh_TW]=接收到簡訊
Action=Popup Action=Popup
Urgency=Low Urgency=Low

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Remote control your music and videos", "Description": "Remote control your music and videos",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Show device's notifications on this computer and keep them in sync", "Description": "Show device's notifications on this computer and keep them in sync",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Pause music/videos during a phone call", "Description": "Pause music/videos during a phone call",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Send and receive pings", "Description": "Send and receive pings",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
}, },
{ {
"Email": "david@davidedmundson.co.uk", "Email": "david@davidedmundson.co.uk",

View file

@ -88,6 +88,7 @@
"Description[uk]": "Транслювати сповіщення з цього комп’ютера так, щоб їх було показано на інших пристроях.", "Description[uk]": "Транслювати сповіщення з цього комп’ютера так, щоб їх було показано на інших пристроях.",
"Description[x-test]": "xxBroadcast this computer's notifications, so they can be shown on other devices.xx", "Description[x-test]": "xxBroadcast this computer's notifications, so they can be shown on other devices.xx",
"Description[zh_CN]": "广播此电脑的通知,以便在其他设备上显示。", "Description[zh_CN]": "广播此电脑的通知,以便在其他设备上显示。",
"Description[zh_TW]": "廣播這台電腦的通知,讓其他裝置能夠顯示它們。",
"EnabledByDefault": false, "EnabledByDefault": false,
"Icon": "preferences-desktop-notification", "Icon": "preferences-desktop-notification",
"License": "GPL", "License": "GPL",
@ -125,7 +126,8 @@
"Name[tr]": "Bildirim gönder", "Name[tr]": "Bildirim gönder",
"Name[uk]": "Надіслати сповіщення", "Name[uk]": "Надіслати сповіщення",
"Name[x-test]": "xxSend notificationsxx", "Name[x-test]": "xxSend notificationsxx",
"Name[zh_CN]": "发送通知" "Name[zh_CN]": "发送通知",
"Name[zh_TW]": "傳送通知"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_sendnotifications_config", "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_sendnotifications_config",
"X-KdeConnect-OutgoingPacketType": [ "X-KdeConnect-OutgoingPacketType": [

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Receive and send files, URLs or plain text easily", "Description": "Receive and send files, URLs or plain text easily",

View file

@ -35,7 +35,8 @@
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx", "Name[x-test]": "xxAlbert Vaca Cintoraxx",
"Name[zh_CN]": "Albert Vaca Cintora" "Name[zh_CN]": "Albert Vaca Cintora",
"Name[zh_TW]": "Albert Vaca Cintora"
} }
], ],
"Description": "Show notifications for incoming calls", "Description": "Show notifications for incoming calls",