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-13 03:05:27 +00:00
parent e25be49aff
commit 7761a3bf7b
11 changed files with 12 additions and 0 deletions

View file

@ -30,6 +30,7 @@
"Description[pt]": "Ligue e sincronize os seus dispositivos", "Description[pt]": "Ligue e sincronize os seus dispositivos",
"Description[pt_BR]": "Conecta e sincroniza seus dispositivos", "Description[pt_BR]": "Conecta e sincroniza seus dispositivos",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами", "Description[ru]": "Подключение и синхронизация с мобильными устройствами",
"Description[sk]": "Pripojiť a synchronizovať vaše zariadenia",
"Description[sl]": "Poveži in sinhroniziraj svoje naprave", "Description[sl]": "Poveži in sinhroniziraj svoje naprave",
"Description[sv]": "Anslut och synkronisera dina apparater", "Description[sv]": "Anslut och synkronisera dina apparater",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla", "Description[tr]": "Aygıtlarını bağla ve eşzamanla",
@ -66,6 +67,7 @@
"Name[pt]": "KDE Connect", "Name[pt]": "KDE Connect",
"Name[pt_BR]": "KDE Connect", "Name[pt_BR]": "KDE Connect",
"Name[ru]": "KDE Connect", "Name[ru]": "KDE Connect",
"Name[sk]": "KDE Connect",
"Name[sl]": "KDE Connect", "Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut", "Name[sv]": "KDE-anslut",
"Name[tr]": "KDE Bağlan", "Name[tr]": "KDE Bağlan",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -31,6 +31,7 @@
"Name[pt]": "Yoram Bar-Haim", "Name[pt]": "Yoram Bar-Haim",
"Name[pt_BR]": "Yoram Bar-Haim", "Name[pt_BR]": "Yoram Bar-Haim",
"Name[ru]": "Yoram Bar-Haim", "Name[ru]": "Yoram Bar-Haim",
"Name[sk]": "Yoram Bar-Haim",
"Name[sl]": "Yoram Bar-Haim", "Name[sl]": "Yoram Bar-Haim",
"Name[sv]": "Yoram Bar-Haim", "Name[sv]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim", "Name[tr]": "Yoram Bar-Haim",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",