Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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
2022-04-19 01:44:50 +00:00
parent a58c787986
commit d45679bdbd
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
events/x11/krfb_events_x11.json
View File

@@ -2,7 +2,7 @@
"Encoding": "UTF-8",
"KPlugin": {
"Description": "X11 XFakeInput based event handler for KRfb",
"Description[ca@valencia]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per al KRfb",
"Description[ca@valencia]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per a KRfb",
"Description[ca]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per al KRfb",
"Description[da]": "X11 XFakeInput baseret hændelseshåndtering til KRfb",
"Description[de]": "Ereignis-Modul basierend auf X11 XFakeInput für KRfb",
@@ -33,7 +33,7 @@
"Id": "x11",
"License": "GPL",
"Name": "X11 Event handler for KRfb",
"Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per al KRfb",
"Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per a KRfb",
"Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb",
"Name[da]": "X11 hændelseshåndtering til KRfb",
"Name[de]": "Ereignis-Modul basierend auf X11 für KRfb",

4
events/xdp/krfb_events_xdp.json
View File

@@ -2,7 +2,7 @@
"Encoding": "UTF-8",
"KPlugin": {
"Description": "Xdg-desktop-portal based event handler for KRfb",
"Description[ca@valencia]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per al KRfb",
"Description[ca@valencia]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per a KRfb",
"Description[ca]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per al KRfb",
"Description[da]": "Xdg-desktop-portal baseret hændelseshåndtering til KRfb",
"Description[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb",
@@ -33,7 +33,7 @@
"Id": "xdp",
"License": "GPL",
"Name": "Xdg-desktop-portal Event handler for KRfb",
"Name[ca@valencia]": "Gestor d'esdeveniments «Xdg-desktop-portal» per al KRfb",
"Name[ca@valencia]": "Gestor d'esdeveniments «Xdg-desktop-portal» per a KRfb",
"Name[ca]": "Gestor d'esdeveniments «Xdg-desktop-portal» per al KRfb",
"Name[da]": "Xdg-desktop-portal hændelseshåndtering til KRfb",
"Name[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb",