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
72e9967212
commit
7963effff6
7 changed files with 7 additions and 7 deletions
|
@ -58,7 +58,7 @@ GenericName[ar]=مزامنة الأجهزة
|
|||
GenericName[az]=Cihazların eyniləşdirilməsi
|
||||
GenericName[bg]=Синхронизация на устройство
|
||||
GenericName[ca]=Sincronització de dispositius
|
||||
GenericName[ca@valencia]=Sincronització de dispositius
|
||||
GenericName[ca@valencia]=Sincronitzeu els dispositius
|
||||
GenericName[cs]=Synchronizace zařízení
|
||||
GenericName[da]=Enhedssynkronisering
|
||||
GenericName[de]=Geräteabgleich
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
"Name[cs]": "Hlasové ovládání pro Bigscreen",
|
||||
"Name[de]": "Bigscreen-Spracheingabe",
|
||||
"Name[en_GB]": "Bigscreen voice control",
|
||||
"Name[eo]": "Grandekrana voĉa kontrolo",
|
||||
"Name[eo]": "Grandekrana pervoĉa stiro",
|
||||
"Name[es]": "Control de voz de Bigscreen",
|
||||
"Name[eu]": "«Bigscreen»en ahots agintea",
|
||||
"Name[fi]": "Bigscreen-äänen hallinta",
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
"Name[de]": "Steuerung für Multimedia-Empfänger",
|
||||
"Name[el]": "Δέκτης ελέγχου πολυμέσων",
|
||||
"Name[en_GB]": "Multimedia control receiver",
|
||||
"Name[eo]": "Multmedia kontrolo ricevilo",
|
||||
"Name[eo]": "Multmediostira ricevilo",
|
||||
"Name[es]": "Receptor de control multimedia",
|
||||
"Name[et]": "Multimeedia juhtimine",
|
||||
"Name[eu]": "Multimedia-kontroladore hartzailea",
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
"Description[de]": "Steuerung von MPRIS-Diensten",
|
||||
"Description[el]": "Έλεγχος υπηρεσιών MPRIS",
|
||||
"Description[en_GB]": "Control MPRIS services",
|
||||
"Description[eo]": "Kontroli MPRIS-servojn",
|
||||
"Description[eo]": "Regi MPRIS-servojn",
|
||||
"Description[es]": "Controlar los servicios MPRIS",
|
||||
"Description[et]": "MPRIS-teenuste juhtimine",
|
||||
"Description[eu]": "Kontrolatu MPRIS zerbitzuak",
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
"Description[de]": "Entfernte Systeme steuern",
|
||||
"Description[el]": "Έλεγχος ανταπόκρισης απομακρυσμένων συστημάτων",
|
||||
"Description[en_GB]": "Control Remote systems",
|
||||
"Description[eo]": "Kontroli Forajn sistemojn",
|
||||
"Description[eo]": "Regi Forajn sistemojn",
|
||||
"Description[es]": "Controlar sistemas remotos",
|
||||
"Description[et]": "Kaugjuhtimissüsteemid",
|
||||
"Description[eu]": "Kontrolatu urruneko sistemak",
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
"Description[de]": "Steuert die Lautstärke eines verbundenen Geräts",
|
||||
"Description[el]": "Έλεγχος του τόμου της συνδεδεμένης συσκευής",
|
||||
"Description[en_GB]": "Control the volume of the connected device",
|
||||
"Description[eo]": "Kontroli la laŭtecon de la konektita aparato",
|
||||
"Description[eo]": "Regi la laŭtecon de la konektita aparato",
|
||||
"Description[es]": "Controle el volumen del dispositivo conectado",
|
||||
"Description[et]": "Ühendatud seadme helitugevuse juhtimine",
|
||||
"Description[eu]": "Kontrolatu konektatutako gailuaren bolumena",
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
"Description[de]": "Steuert die Lautstärke des Systems über Ihr Telefon",
|
||||
"Description[el]": "Έλεγοχς του τόμου του συστήματοα από το τηλέφωνό σας",
|
||||
"Description[en_GB]": "Control the system volume from your phone",
|
||||
"Description[eo]": "Kontroli la sisteman laŭtecon de via telefono",
|
||||
"Description[eo]": "Regi la sisteman laŭtecon de via telefono",
|
||||
"Description[es]": "Controle el volumen del sistema desde su teléfono",
|
||||
"Description[et]": "Süsteemi helitugevuse juhtimine oma telefonist",
|
||||
"Description[eu]": "Kontrolatu sistemaren bolumena zure telefonotik",
|
||||
|
|
Loading…
Reference in a new issue